diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationTypeAnnotation.cs b/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationTypeAnnotation.cs
index 29e65140..ccecb15c 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationTypeAnnotation.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationTypeAnnotation.cs
@@ -402,6 +402,7 @@ namespace VEPROMS.CSLA.Library
 		{
 			MarkAsChild();
 			// TODO: Add any initialization & defaults
+			_AnnotationID = Annotation.NextAnnotationID;
 			_DTS = _AnnotationTypeAnnotationExtension.DefaultDTS;
 			_UserID = _AnnotationTypeAnnotationExtension.DefaultUserID;
 			_MyItem = myItem;
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationTypeInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationTypeInfo.cs
index 65afcb9c..8ea97884 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationTypeInfo.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationTypeInfo.cs
@@ -151,6 +151,8 @@ namespace VEPROMS.CSLA.Library
 			get
 			{
 				CanReadProperty("AnnotationTypeAnnotationCount", true);
+				if (_AnnotationTypeAnnotationCount < 0)
+					_AnnotationTypeAnnotationCount = AnnotationTypeAnnotations.Count;
 				return _AnnotationTypeAnnotationCount;
 			}
 		}
@@ -171,6 +173,7 @@ namespace VEPROMS.CSLA.Library
 		}
 		public void RefreshAnnotationTypeAnnotations()
 		{
+			_AnnotationTypeAnnotationCount = -1;
 			ConvertListToDictionary();
 			if (_CacheByPrimaryKey.ContainsKey(_TypeID.ToString()))
 				foreach (AnnotationTypeInfo tmp in _CacheByPrimaryKey[_TypeID.ToString()])
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ConnectionFolder.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ConnectionFolder.cs
index 26988cde..3dd79f9f 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/ConnectionFolder.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/ConnectionFolder.cs
@@ -451,6 +451,7 @@ namespace VEPROMS.CSLA.Library
 		{
 			MarkAsChild();
 			// TODO: Add any initialization & defaults
+			_FolderID = Folder.NextFolderID;
 			_ParentID = _ConnectionFolderExtension.DefaultParentID;
 			_DTS = _ConnectionFolderExtension.DefaultDTS;
 			_UsrID = _ConnectionFolderExtension.DefaultUsrID;
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ConnectionInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ConnectionInfo.cs
index b4c793b5..ae7fe4b0 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/ConnectionInfo.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/ConnectionInfo.cs
@@ -184,6 +184,8 @@ namespace VEPROMS.CSLA.Library
 			get
 			{
 				CanReadProperty("ConnectionFolderCount", true);
+				if (_ConnectionFolderCount < 0)
+					_ConnectionFolderCount = ConnectionFolders.Count;
 				return _ConnectionFolderCount;
 			}
 		}
@@ -204,6 +206,7 @@ namespace VEPROMS.CSLA.Library
 		}
 		public void RefreshConnectionFolders()
 		{
+			_ConnectionFolderCount = -1;
 			ConvertListToDictionary();
 			if (_CacheByPrimaryKey.ContainsKey(_DBID.ToString()))
 				foreach (ConnectionInfo tmp in _CacheByPrimaryKey[_DBID.ToString()])
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ContentDetail.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ContentDetail.cs
index 1f71e42f..00eda9e6 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/ContentDetail.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/ContentDetail.cs
@@ -307,6 +307,7 @@ namespace VEPROMS.CSLA.Library
 		{
 			MarkAsChild();
 			// TODO: Add any initialization & defaults
+			_DetailID = Detail.NextDetailID;
 			_DTS = _ContentDetailExtension.DefaultDTS;
 			_UserID = _ContentDetailExtension.DefaultUserID;
 			_ItemType = itemType;
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ContentInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ContentInfo.cs
index c2aad309..f6e1ea9e 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/ContentInfo.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/ContentInfo.cs
@@ -196,6 +196,8 @@ namespace VEPROMS.CSLA.Library
 			get
 			{
 				CanReadProperty("ContentDetailCount", true);
+				if (_ContentDetailCount < 0)
+					_ContentDetailCount = ContentDetails.Count;
 				return _ContentDetailCount;
 			}
 		}
@@ -216,6 +218,7 @@ namespace VEPROMS.CSLA.Library
 		}
 		public void RefreshContentDetails()
 		{
+			_ContentDetailCount = -1;
 			ConvertListToDictionary();
 			if (_CacheByPrimaryKey.ContainsKey(_ContentID.ToString()))
 				foreach (ContentInfo tmp in _CacheByPrimaryKey[_ContentID.ToString()])
@@ -260,6 +263,8 @@ namespace VEPROMS.CSLA.Library
 			get
 			{
 				CanReadProperty("ContentItemCount", true);
+				if (_ContentItemCount < 0)
+					_ContentItemCount = ContentItems.Count;
 				return _ContentItemCount;
 			}
 		}
@@ -280,6 +285,7 @@ namespace VEPROMS.CSLA.Library
 		}
 		public void RefreshContentItems()
 		{
+			_ContentItemCount = -1;
 			ConvertListToDictionary();
 			if (_CacheByPrimaryKey.ContainsKey(_ContentID.ToString()))
 				foreach (ContentInfo tmp in _CacheByPrimaryKey[_ContentID.ToString()])
@@ -295,6 +301,8 @@ namespace VEPROMS.CSLA.Library
 			get
 			{
 				CanReadProperty("ContentPartCount", true);
+				if (_ContentPartCount < 0)
+					_ContentPartCount = ContentParts.Count;
 				return _ContentPartCount;
 			}
 		}
@@ -315,6 +323,7 @@ namespace VEPROMS.CSLA.Library
 		}
 		public void RefreshContentParts()
 		{
+			_ContentPartCount = -1;
 			ConvertListToDictionary();
 			if (_CacheByPrimaryKey.ContainsKey(_ContentID.ToString()))
 				foreach (ContentInfo tmp in _CacheByPrimaryKey[_ContentID.ToString()])
@@ -330,6 +339,8 @@ namespace VEPROMS.CSLA.Library
 			get
 			{
 				CanReadProperty("ContentRoUsageCount", true);
+				if (_ContentRoUsageCount < 0)
+					_ContentRoUsageCount = ContentRoUsages.Count;
 				return _ContentRoUsageCount;
 			}
 		}
@@ -350,6 +361,7 @@ namespace VEPROMS.CSLA.Library
 		}
 		public void RefreshContentRoUsages()
 		{
+			_ContentRoUsageCount = -1;
 			ConvertListToDictionary();
 			if (_CacheByPrimaryKey.ContainsKey(_ContentID.ToString()))
 				foreach (ContentInfo tmp in _CacheByPrimaryKey[_ContentID.ToString()])
@@ -365,6 +377,8 @@ namespace VEPROMS.CSLA.Library
 			get
 			{
 				CanReadProperty("ContentTransitionCount", true);
+				if (_ContentTransitionCount < 0)
+					_ContentTransitionCount = ContentTransitions.Count;
 				return _ContentTransitionCount;
 			}
 		}
@@ -385,6 +399,7 @@ namespace VEPROMS.CSLA.Library
 		}
 		public void RefreshContentTransitions()
 		{
+			_ContentTransitionCount = -1;
 			ConvertListToDictionary();
 			if (_CacheByPrimaryKey.ContainsKey(_ContentID.ToString()))
 				foreach (ContentInfo tmp in _CacheByPrimaryKey[_ContentID.ToString()])
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ContentRoUsage.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ContentRoUsage.cs
index 73174519..72b85434 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/ContentRoUsage.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/ContentRoUsage.cs
@@ -407,6 +407,7 @@ namespace VEPROMS.CSLA.Library
 		{
 			MarkAsChild();
 			// TODO: Add any initialization & defaults
+			_ROUsageID = RoUsage.NextROUsageID;
 			_DTS = _ContentRoUsageExtension.DefaultDTS;
 			_UserID = _ContentRoUsageExtension.DefaultUserID;
 			_ROID = roid;
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ContentTransition.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ContentTransition.cs
index 88fcfde7..a77c2086 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/ContentTransition.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/ContentTransition.cs
@@ -461,6 +461,7 @@ namespace VEPROMS.CSLA.Library
 		{
 			MarkAsChild();
 			// TODO: Add any initialization & defaults
+			_TransitionID = Transition.NextTransitionID;
 			_TranType = _ContentTransitionExtension.DefaultTranType;
 			_DTS = _ContentTransitionExtension.DefaultDTS;
 			_UserID = _ContentTransitionExtension.DefaultUserID;
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/DocVersionAssociation.cs b/PROMS/VEPROMS.CSLA.Library/Generated/DocVersionAssociation.cs
index 8f5ad9f2..14acb2d9 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/DocVersionAssociation.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/DocVersionAssociation.cs
@@ -360,6 +360,7 @@ namespace VEPROMS.CSLA.Library
 		{
 			MarkAsChild();
 			// TODO: Add any initialization & defaults
+			_AssociationID = Association.NextAssociationID;
 			_DTS = _DocVersionAssociationExtension.DefaultDTS;
 			_UserID = _DocVersionAssociationExtension.DefaultUserID;
 			_MyROFst = myROFst;
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/DocVersionInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/DocVersionInfo.cs
index 3a7ffa36..c067492b 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/DocVersionInfo.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/DocVersionInfo.cs
@@ -240,6 +240,8 @@ namespace VEPROMS.CSLA.Library
 			get
 			{
 				CanReadProperty("DocVersionAssociationCount", true);
+				if (_DocVersionAssociationCount < 0)
+					_DocVersionAssociationCount = DocVersionAssociations.Count;
 				return _DocVersionAssociationCount;
 			}
 		}
@@ -260,6 +262,7 @@ namespace VEPROMS.CSLA.Library
 		}
 		public void RefreshDocVersionAssociations()
 		{
+			_DocVersionAssociationCount = -1;
 			ConvertListToDictionary();
 			if (_CacheByPrimaryKey.ContainsKey(_VersionID.ToString()))
 				foreach (DocVersionInfo tmp in _CacheByPrimaryKey[_VersionID.ToString()])
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/DocumentInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/DocumentInfo.cs
index 8b027dba..71be2d37 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/DocumentInfo.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/DocumentInfo.cs
@@ -177,6 +177,8 @@ namespace VEPROMS.CSLA.Library
 			get
 			{
 				CanReadProperty("DocumentEntryCount", true);
+				if (_DocumentEntryCount < 0)
+					_DocumentEntryCount = DocumentEntries.Count;
 				return _DocumentEntryCount;
 			}
 		}
@@ -197,6 +199,7 @@ namespace VEPROMS.CSLA.Library
 		}
 		public void RefreshDocumentEntries()
 		{
+			_DocumentEntryCount = -1;
 			ConvertListToDictionary();
 			if (_CacheByPrimaryKey.ContainsKey(_DocID.ToString()))
 				foreach (DocumentInfo tmp in _CacheByPrimaryKey[_DocID.ToString()])
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/FolderAssignment.cs b/PROMS/VEPROMS.CSLA.Library/Generated/FolderAssignment.cs
index 1f75dc61..871d654a 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/FolderAssignment.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/FolderAssignment.cs
@@ -514,6 +514,7 @@ namespace VEPROMS.CSLA.Library
 		{
 			MarkAsChild();
 			// TODO: Add any initialization & defaults
+			_AID = Assignment.NextAID;
 			_StartDate = _FolderAssignmentExtension.DefaultStartDate;
 			_DTS = _FolderAssignmentExtension.DefaultDTS;
 			_UsrID = _FolderAssignmentExtension.DefaultUsrID;
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/FolderDocVersion.cs b/PROMS/VEPROMS.CSLA.Library/Generated/FolderDocVersion.cs
index 733f6aff..2e99e6fe 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/FolderDocVersion.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/FolderDocVersion.cs
@@ -409,6 +409,7 @@ namespace VEPROMS.CSLA.Library
 		{
 			MarkAsChild();
 			// TODO: Add any initialization & defaults
+			_VersionID = DocVersion.NextVersionID;
 			_VersionType = _FolderDocVersionExtension.DefaultVersionType;
 			_DTS = _FolderDocVersionExtension.DefaultDTS;
 			_UserID = _FolderDocVersionExtension.DefaultUserID;
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/FolderInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/FolderInfo.cs
index 0a4b88f4..e1ee0359 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/FolderInfo.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/FolderInfo.cs
@@ -247,6 +247,8 @@ namespace VEPROMS.CSLA.Library
 			get
 			{
 				CanReadProperty("FolderAssignmentCount", true);
+				if (_FolderAssignmentCount < 0)
+					_FolderAssignmentCount = FolderAssignments.Count;
 				return _FolderAssignmentCount;
 			}
 		}
@@ -267,6 +269,7 @@ namespace VEPROMS.CSLA.Library
 		}
 		public void RefreshFolderAssignments()
 		{
+			_FolderAssignmentCount = -1;
 			ConvertListToDictionary();
 			if (_CacheByPrimaryKey.ContainsKey(_FolderID.ToString()))
 				foreach (FolderInfo tmp in _CacheByPrimaryKey[_FolderID.ToString()])
@@ -282,6 +285,8 @@ namespace VEPROMS.CSLA.Library
 			get
 			{
 				CanReadProperty("FolderDocVersionCount", true);
+				if (_FolderDocVersionCount < 0)
+					_FolderDocVersionCount = FolderDocVersions.Count;
 				return _FolderDocVersionCount;
 			}
 		}
@@ -302,6 +307,7 @@ namespace VEPROMS.CSLA.Library
 		}
 		public void RefreshFolderDocVersions()
 		{
+			_FolderDocVersionCount = -1;
 			ConvertListToDictionary();
 			if (_CacheByPrimaryKey.ContainsKey(_FolderID.ToString()))
 				foreach (FolderInfo tmp in _CacheByPrimaryKey[_FolderID.ToString()])
@@ -317,6 +323,8 @@ namespace VEPROMS.CSLA.Library
 			get
 			{
 				CanReadProperty("ChildFolderCount", true);
+				if (_ChildFolderCount < 0)
+					_ChildFolderCount = ChildFolders.Count;
 				return _ChildFolderCount;
 			}
 		}
@@ -337,6 +345,7 @@ namespace VEPROMS.CSLA.Library
 		}
 		public void RefreshChildFolders()
 		{
+			_ChildFolderCount = -1;
 			ConvertListToDictionary();
 			if (_CacheByPrimaryKey.ContainsKey(_FolderID.ToString()))
 				foreach (FolderInfo tmp in _CacheByPrimaryKey[_FolderID.ToString()])
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/FormatDocVersion.cs b/PROMS/VEPROMS.CSLA.Library/Generated/FormatDocVersion.cs
index 97127734..f2882383 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/FormatDocVersion.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/FormatDocVersion.cs
@@ -526,6 +526,7 @@ namespace VEPROMS.CSLA.Library
 		{
 			MarkAsChild();
 			// TODO: Add any initialization & defaults
+			_VersionID = DocVersion.NextVersionID;
 			_VersionType = _FormatDocVersionExtension.DefaultVersionType;
 			_DTS = _FormatDocVersionExtension.DefaultDTS;
 			_UserID = _FormatDocVersionExtension.DefaultUserID;
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/FormatFolder.cs b/PROMS/VEPROMS.CSLA.Library/Generated/FormatFolder.cs
index 601bcd93..7e62c32c 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/FormatFolder.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/FormatFolder.cs
@@ -534,6 +534,7 @@ namespace VEPROMS.CSLA.Library
 		{
 			MarkAsChild();
 			// TODO: Add any initialization & defaults
+			_FolderID = Folder.NextFolderID;
 			_ParentID = _FormatFolderExtension.DefaultParentID;
 			_DBID = _FormatFolderExtension.DefaultDBID;
 			_DTS = _FormatFolderExtension.DefaultDTS;
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/FormatInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/FormatInfo.cs
index 0578157d..67cf5997 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/FormatInfo.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/FormatInfo.cs
@@ -193,6 +193,8 @@ namespace VEPROMS.CSLA.Library
 			get
 			{
 				CanReadProperty("FormatContentCount", true);
+				if (_FormatContentCount < 0)
+					_FormatContentCount = FormatContents.Count;
 				return _FormatContentCount;
 			}
 		}
@@ -213,6 +215,7 @@ namespace VEPROMS.CSLA.Library
 		}
 		public void RefreshFormatContents()
 		{
+			_FormatContentCount = -1;
 			ConvertListToDictionary();
 			if (_CacheByPrimaryKey.ContainsKey(_FormatID.ToString()))
 				foreach (FormatInfo tmp in _CacheByPrimaryKey[_FormatID.ToString()])
@@ -228,6 +231,8 @@ namespace VEPROMS.CSLA.Library
 			get
 			{
 				CanReadProperty("FormatDocVersionCount", true);
+				if (_FormatDocVersionCount < 0)
+					_FormatDocVersionCount = FormatDocVersions.Count;
 				return _FormatDocVersionCount;
 			}
 		}
@@ -248,6 +253,7 @@ namespace VEPROMS.CSLA.Library
 		}
 		public void RefreshFormatDocVersions()
 		{
+			_FormatDocVersionCount = -1;
 			ConvertListToDictionary();
 			if (_CacheByPrimaryKey.ContainsKey(_FormatID.ToString()))
 				foreach (FormatInfo tmp in _CacheByPrimaryKey[_FormatID.ToString()])
@@ -263,6 +269,8 @@ namespace VEPROMS.CSLA.Library
 			get
 			{
 				CanReadProperty("FormatFolderCount", true);
+				if (_FormatFolderCount < 0)
+					_FormatFolderCount = FormatFolders.Count;
 				return _FormatFolderCount;
 			}
 		}
@@ -283,6 +291,7 @@ namespace VEPROMS.CSLA.Library
 		}
 		public void RefreshFormatFolders()
 		{
+			_FormatFolderCount = -1;
 			ConvertListToDictionary();
 			if (_CacheByPrimaryKey.ContainsKey(_FormatID.ToString()))
 				foreach (FormatInfo tmp in _CacheByPrimaryKey[_FormatID.ToString()])
@@ -298,6 +307,8 @@ namespace VEPROMS.CSLA.Library
 			get
 			{
 				CanReadProperty("ChildFormatCount", true);
+				if (_ChildFormatCount < 0)
+					_ChildFormatCount = ChildFormats.Count;
 				return _ChildFormatCount;
 			}
 		}
@@ -318,6 +329,7 @@ namespace VEPROMS.CSLA.Library
 		}
 		public void RefreshChildFormats()
 		{
+			_ChildFormatCount = -1;
 			ConvertListToDictionary();
 			if (_CacheByPrimaryKey.ContainsKey(_FormatID.ToString()))
 				foreach (FormatInfo tmp in _CacheByPrimaryKey[_FormatID.ToString()])
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/GroupAssignment.cs b/PROMS/VEPROMS.CSLA.Library/Generated/GroupAssignment.cs
index d85321ec..67852bcf 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/GroupAssignment.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/GroupAssignment.cs
@@ -564,6 +564,7 @@ namespace VEPROMS.CSLA.Library
 		{
 			MarkAsChild();
 			// TODO: Add any initialization & defaults
+			_AID = Assignment.NextAID;
 			_StartDate = _GroupAssignmentExtension.DefaultStartDate;
 			_DTS = _GroupAssignmentExtension.DefaultDTS;
 			_UsrID = _GroupAssignmentExtension.DefaultUsrID;
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/GroupInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/GroupInfo.cs
index 4b00a128..10891cbf 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/GroupInfo.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/GroupInfo.cs
@@ -161,6 +161,8 @@ namespace VEPROMS.CSLA.Library
 			get
 			{
 				CanReadProperty("GroupAssignmentCount", true);
+				if (_GroupAssignmentCount < 0)
+					_GroupAssignmentCount = GroupAssignments.Count;
 				return _GroupAssignmentCount;
 			}
 		}
@@ -181,6 +183,7 @@ namespace VEPROMS.CSLA.Library
 		}
 		public void RefreshGroupAssignments()
 		{
+			_GroupAssignmentCount = -1;
 			ConvertListToDictionary();
 			if (_CacheByPrimaryKey.ContainsKey(_GID.ToString()))
 				foreach (GroupInfo tmp in _CacheByPrimaryKey[_GID.ToString()])
@@ -196,6 +199,8 @@ namespace VEPROMS.CSLA.Library
 			get
 			{
 				CanReadProperty("GroupMembershipCount", true);
+				if (_GroupMembershipCount < 0)
+					_GroupMembershipCount = GroupMemberships.Count;
 				return _GroupMembershipCount;
 			}
 		}
@@ -216,6 +221,7 @@ namespace VEPROMS.CSLA.Library
 		}
 		public void RefreshGroupMemberships()
 		{
+			_GroupMembershipCount = -1;
 			ConvertListToDictionary();
 			if (_CacheByPrimaryKey.ContainsKey(_GID.ToString()))
 				foreach (GroupInfo tmp in _CacheByPrimaryKey[_GID.ToString()])
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/GroupMembership.cs b/PROMS/VEPROMS.CSLA.Library/Generated/GroupMembership.cs
index c7c3966b..eaf77f8e 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/GroupMembership.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/GroupMembership.cs
@@ -535,6 +535,7 @@ namespace VEPROMS.CSLA.Library
 		{
 			MarkAsChild();
 			// TODO: Add any initialization & defaults
+			_UGID = Membership.NextUGID;
 			_StartDate = _GroupMembershipExtension.DefaultStartDate;
 			_DTS = _GroupMembershipExtension.DefaultDTS;
 			_UsrID = _GroupMembershipExtension.DefaultUsrID;
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ItemAnnotation.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ItemAnnotation.cs
index c1d21322..4c19f601 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/ItemAnnotation.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/ItemAnnotation.cs
@@ -402,6 +402,7 @@ namespace VEPROMS.CSLA.Library
 		{
 			MarkAsChild();
 			// TODO: Add any initialization & defaults
+			_AnnotationID = Annotation.NextAnnotationID;
 			_DTS = _ItemAnnotationExtension.DefaultDTS;
 			_UserID = _ItemAnnotationExtension.DefaultUserID;
 			_MyAnnotationType = myAnnotationType;
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ItemDocVersion.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ItemDocVersion.cs
index 8cca4ccf..7dbac35a 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/ItemDocVersion.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/ItemDocVersion.cs
@@ -526,6 +526,7 @@ namespace VEPROMS.CSLA.Library
 		{
 			MarkAsChild();
 			// TODO: Add any initialization & defaults
+			_VersionID = DocVersion.NextVersionID;
 			_VersionType = _ItemDocVersionExtension.DefaultVersionType;
 			_DTS = _ItemDocVersionExtension.DefaultDTS;
 			_UserID = _ItemDocVersionExtension.DefaultUserID;
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ItemInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ItemInfo.cs
index c5f6ab91..64ec29f0 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/ItemInfo.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/ItemInfo.cs
@@ -175,6 +175,8 @@ namespace VEPROMS.CSLA.Library
 			get
 			{
 				CanReadProperty("ItemAnnotationCount", true);
+				if (_ItemAnnotationCount < 0)
+					_ItemAnnotationCount = ItemAnnotations.Count;
 				return _ItemAnnotationCount;
 			}
 		}
@@ -195,6 +197,7 @@ namespace VEPROMS.CSLA.Library
 		}
 		public void RefreshItemAnnotations()
 		{
+			_ItemAnnotationCount = -1;
 			ConvertListToDictionary();
 			if (_CacheByPrimaryKey.ContainsKey(_ItemID.ToString()))
 				foreach (ItemInfo tmp in _CacheByPrimaryKey[_ItemID.ToString()])
@@ -210,6 +213,8 @@ namespace VEPROMS.CSLA.Library
 			get
 			{
 				CanReadProperty("ItemDocVersionCount", true);
+				if (_ItemDocVersionCount < 0)
+					_ItemDocVersionCount = ItemDocVersions.Count;
 				return _ItemDocVersionCount;
 			}
 		}
@@ -230,6 +235,7 @@ namespace VEPROMS.CSLA.Library
 		}
 		public void RefreshItemDocVersions()
 		{
+			_ItemDocVersionCount = -1;
 			ConvertListToDictionary();
 			if (_CacheByPrimaryKey.ContainsKey(_ItemID.ToString()))
 				foreach (ItemInfo tmp in _CacheByPrimaryKey[_ItemID.ToString()])
@@ -245,6 +251,8 @@ namespace VEPROMS.CSLA.Library
 			get
 			{
 				CanReadProperty("NextItemCount", true);
+				if (_NextItemCount < 0)
+					_NextItemCount = NextItems.Count;
 				return _NextItemCount;
 			}
 		}
@@ -265,6 +273,7 @@ namespace VEPROMS.CSLA.Library
 		}
 		public void RefreshNextItems()
 		{
+			_NextItemCount = -1;
 			ConvertListToDictionary();
 			if (_CacheByPrimaryKey.ContainsKey(_ItemID.ToString()))
 				foreach (ItemInfo tmp in _CacheByPrimaryKey[_ItemID.ToString()])
@@ -280,6 +289,8 @@ namespace VEPROMS.CSLA.Library
 			get
 			{
 				CanReadProperty("ItemPartCount", true);
+				if (_ItemPartCount < 0)
+					_ItemPartCount = ItemParts.Count;
 				return _ItemPartCount;
 			}
 		}
@@ -300,6 +311,7 @@ namespace VEPROMS.CSLA.Library
 		}
 		public void RefreshItemParts()
 		{
+			_ItemPartCount = -1;
 			ConvertListToDictionary();
 			if (_CacheByPrimaryKey.ContainsKey(_ItemID.ToString()))
 				foreach (ItemInfo tmp in _CacheByPrimaryKey[_ItemID.ToString()])
@@ -307,7 +319,7 @@ namespace VEPROMS.CSLA.Library
 		}
 		private int _ItemTransition_RangeIDCount = 0;
 		/// <summary>
-		/// Count of ItemTransitions for this Item
+		/// Count of ItemTransitions_RangeID for this Item
 		/// </summary>
 		public int ItemTransition_RangeIDCount
 		{
@@ -315,6 +327,8 @@ namespace VEPROMS.CSLA.Library
 			get
 			{
 				CanReadProperty("ItemTransition_RangeIDCount", true);
+				if (_ItemTransition_RangeIDCount < 0)
+					_ItemTransition_RangeIDCount = ItemTransitions_RangeID.Count;
 				return _ItemTransition_RangeIDCount;
 			}
 		}
@@ -335,6 +349,7 @@ namespace VEPROMS.CSLA.Library
 		}
 		public void RefreshItemTransitions_RangeID()
 		{
+			_ItemTransition_RangeIDCount = -1;
 			ConvertListToDictionary();
 			if (_CacheByPrimaryKey.ContainsKey(_ItemID.ToString()))
 				foreach (ItemInfo tmp in _CacheByPrimaryKey[_ItemID.ToString()])
@@ -342,7 +357,7 @@ namespace VEPROMS.CSLA.Library
 		}
 		private int _ItemTransition_ToIDCount = 0;
 		/// <summary>
-		/// Count of ItemTransitions for this Item
+		/// Count of ItemTransitions_ToID for this Item
 		/// </summary>
 		public int ItemTransition_ToIDCount
 		{
@@ -350,6 +365,8 @@ namespace VEPROMS.CSLA.Library
 			get
 			{
 				CanReadProperty("ItemTransition_ToIDCount", true);
+				if (_ItemTransition_ToIDCount < 0)
+					_ItemTransition_ToIDCount = ItemTransitions_ToID.Count;
 				return _ItemTransition_ToIDCount;
 			}
 		}
@@ -370,6 +387,7 @@ namespace VEPROMS.CSLA.Library
 		}
 		public void RefreshItemTransitions_ToID()
 		{
+			_ItemTransition_ToIDCount = -1;
 			ConvertListToDictionary();
 			if (_CacheByPrimaryKey.ContainsKey(_ItemID.ToString()))
 				foreach (ItemInfo tmp in _CacheByPrimaryKey[_ItemID.ToString()])
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ItemTransition_RangeID.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ItemTransition_RangeID.cs
index 3c3f50ea..5f5195b1 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/ItemTransition_RangeID.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/ItemTransition_RangeID.cs
@@ -443,6 +443,7 @@ namespace VEPROMS.CSLA.Library
 		{
 			MarkAsChild();
 			// TODO: Add any initialization & defaults
+			_TransitionID = Transition.NextTransitionID;
 			_TranType = _ItemTransition_RangeIDExtension.DefaultTranType;
 			_DTS = _ItemTransition_RangeIDExtension.DefaultDTS;
 			_UserID = _ItemTransition_RangeIDExtension.DefaultUserID;
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ItemTransition_ToID.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ItemTransition_ToID.cs
index 2079bfd4..368f7bca 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/ItemTransition_ToID.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/ItemTransition_ToID.cs
@@ -440,6 +440,7 @@ namespace VEPROMS.CSLA.Library
 		{
 			MarkAsChild();
 			// TODO: Add any initialization & defaults
+			_TransitionID = Transition.NextTransitionID;
 			_TranType = _ItemTransition_ToIDExtension.DefaultTranType;
 			_DTS = _ItemTransition_ToIDExtension.DefaultDTS;
 			_UserID = _ItemTransition_ToIDExtension.DefaultUserID;
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/RODbInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/RODbInfo.cs
index 7c3251e5..2e4a0e95 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/RODbInfo.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/RODbInfo.cs
@@ -180,6 +180,8 @@ namespace VEPROMS.CSLA.Library
 			get
 			{
 				CanReadProperty("RODbROFstCount", true);
+				if (_RODbROFstCount < 0)
+					_RODbROFstCount = RODbROFsts.Count;
 				return _RODbROFstCount;
 			}
 		}
@@ -200,6 +202,7 @@ namespace VEPROMS.CSLA.Library
 		}
 		public void RefreshRODbROFsts()
 		{
+			_RODbROFstCount = -1;
 			ConvertListToDictionary();
 			if (_CacheByPrimaryKey.ContainsKey(_RODbID.ToString()))
 				foreach (RODbInfo tmp in _CacheByPrimaryKey[_RODbID.ToString()])
@@ -215,6 +218,8 @@ namespace VEPROMS.CSLA.Library
 			get
 			{
 				CanReadProperty("RODbROImageCount", true);
+				if (_RODbROImageCount < 0)
+					_RODbROImageCount = RODbROImages.Count;
 				return _RODbROImageCount;
 			}
 		}
@@ -235,6 +240,7 @@ namespace VEPROMS.CSLA.Library
 		}
 		public void RefreshRODbROImages()
 		{
+			_RODbROImageCount = -1;
 			ConvertListToDictionary();
 			if (_CacheByPrimaryKey.ContainsKey(_RODbID.ToString()))
 				foreach (RODbInfo tmp in _CacheByPrimaryKey[_RODbID.ToString()])
@@ -250,6 +256,8 @@ namespace VEPROMS.CSLA.Library
 			get
 			{
 				CanReadProperty("RODbRoUsageCount", true);
+				if (_RODbRoUsageCount < 0)
+					_RODbRoUsageCount = RODbRoUsages.Count;
 				return _RODbRoUsageCount;
 			}
 		}
@@ -270,6 +278,7 @@ namespace VEPROMS.CSLA.Library
 		}
 		public void RefreshRODbRoUsages()
 		{
+			_RODbRoUsageCount = -1;
 			ConvertListToDictionary();
 			if (_CacheByPrimaryKey.ContainsKey(_RODbID.ToString()))
 				foreach (RODbInfo tmp in _CacheByPrimaryKey[_RODbID.ToString()])
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/RODbROFst.cs b/PROMS/VEPROMS.CSLA.Library/Generated/RODbROFst.cs
index 435d814a..45a5d43d 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/RODbROFst.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/RODbROFst.cs
@@ -279,6 +279,7 @@ namespace VEPROMS.CSLA.Library
 		{
 			MarkAsChild();
 			// TODO: Add any initialization & defaults
+			_ROFstID = ROFst.NextROFstID;
 			_DTS = _RODbROFstExtension.DefaultDTS;
 			_UserID = _RODbROFstExtension.DefaultUserID;
 			_ROLookup = rOLookup;
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/RODbROImage.cs b/PROMS/VEPROMS.CSLA.Library/Generated/RODbROImage.cs
index 348bdc57..5258a070 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/RODbROImage.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/RODbROImage.cs
@@ -307,6 +307,7 @@ namespace VEPROMS.CSLA.Library
 		{
 			MarkAsChild();
 			// TODO: Add any initialization & defaults
+			_ImageID = ROImage.NextImageID;
 			_DTS = _RODbROImageExtension.DefaultDTS;
 			_UserID = _RODbROImageExtension.DefaultUserID;
 			_FileName = fileName;
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/RODbRoUsage.cs b/PROMS/VEPROMS.CSLA.Library/Generated/RODbRoUsage.cs
index fb2627fe..252dc0fe 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/RODbRoUsage.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/RODbRoUsage.cs
@@ -412,6 +412,7 @@ namespace VEPROMS.CSLA.Library
 		{
 			MarkAsChild();
 			// TODO: Add any initialization & defaults
+			_ROUsageID = RoUsage.NextROUsageID;
 			_ContentID = _RODbRoUsageExtension.DefaultContentID;
 			_DTS = _RODbRoUsageExtension.DefaultDTS;
 			_UserID = _RODbRoUsageExtension.DefaultUserID;
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ROFstAssociation.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ROFstAssociation.cs
index af4b61a5..17f0b416 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/ROFstAssociation.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/ROFstAssociation.cs
@@ -403,6 +403,7 @@ namespace VEPROMS.CSLA.Library
 		{
 			MarkAsChild();
 			// TODO: Add any initialization & defaults
+			_AssociationID = Association.NextAssociationID;
 			_DTS = _ROFstAssociationExtension.DefaultDTS;
 			_UserID = _ROFstAssociationExtension.DefaultUserID;
 			_MyDocVersion = myDocVersion;
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ROFstFigure.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ROFstFigure.cs
index 0216e86b..f158c667 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/ROFstFigure.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/ROFstFigure.cs
@@ -370,6 +370,7 @@ namespace VEPROMS.CSLA.Library
 		{
 			MarkAsChild();
 			// TODO: Add any initialization & defaults
+			_FigureID = Figure.NextFigureID;
 			_DTS = _ROFstFigureExtension.DefaultDTS;
 			_UserID = _ROFstFigureExtension.DefaultUserID;
 			_MyROImage = myROImage;
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ROFstInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ROFstInfo.cs
index 3e9d2b59..5ead89a1 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/ROFstInfo.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/ROFstInfo.cs
@@ -173,6 +173,8 @@ namespace VEPROMS.CSLA.Library
 			get
 			{
 				CanReadProperty("ROFstAssociationCount", true);
+				if (_ROFstAssociationCount < 0)
+					_ROFstAssociationCount = ROFstAssociations.Count;
 				return _ROFstAssociationCount;
 			}
 		}
@@ -193,6 +195,7 @@ namespace VEPROMS.CSLA.Library
 		}
 		public void RefreshROFstAssociations()
 		{
+			_ROFstAssociationCount = -1;
 			ConvertListToDictionary();
 			if (_CacheByPrimaryKey.ContainsKey(_ROFstID.ToString()))
 				foreach (ROFstInfo tmp in _CacheByPrimaryKey[_ROFstID.ToString()])
@@ -208,6 +211,8 @@ namespace VEPROMS.CSLA.Library
 			get
 			{
 				CanReadProperty("ROFstFigureCount", true);
+				if (_ROFstFigureCount < 0)
+					_ROFstFigureCount = ROFstFigures.Count;
 				return _ROFstFigureCount;
 			}
 		}
@@ -228,6 +233,7 @@ namespace VEPROMS.CSLA.Library
 		}
 		public void RefreshROFstFigures()
 		{
+			_ROFstFigureCount = -1;
 			ConvertListToDictionary();
 			if (_CacheByPrimaryKey.ContainsKey(_ROFstID.ToString()))
 				foreach (ROFstInfo tmp in _CacheByPrimaryKey[_ROFstID.ToString()])
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ROImageFigure.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ROImageFigure.cs
index 8053ecc5..764e80e0 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/ROImageFigure.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/ROImageFigure.cs
@@ -360,6 +360,7 @@ namespace VEPROMS.CSLA.Library
 		{
 			MarkAsChild();
 			// TODO: Add any initialization & defaults
+			_FigureID = Figure.NextFigureID;
 			_DTS = _ROImageFigureExtension.DefaultDTS;
 			_UserID = _ROImageFigureExtension.DefaultUserID;
 			_MyROFst = myROFst;
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ROImageInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ROImageInfo.cs
index 78bf3a7b..25747ec5 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/ROImageInfo.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/ROImageInfo.cs
@@ -183,6 +183,8 @@ namespace VEPROMS.CSLA.Library
 			get
 			{
 				CanReadProperty("ROImageFigureCount", true);
+				if (_ROImageFigureCount < 0)
+					_ROImageFigureCount = ROImageFigures.Count;
 				return _ROImageFigureCount;
 			}
 		}
@@ -203,6 +205,7 @@ namespace VEPROMS.CSLA.Library
 		}
 		public void RefreshROImageFigures()
 		{
+			_ROImageFigureCount = -1;
 			ConvertListToDictionary();
 			if (_CacheByPrimaryKey.ContainsKey(_ImageID.ToString()))
 				foreach (ROImageInfo tmp in _CacheByPrimaryKey[_ImageID.ToString()])
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/RoleAssignment.cs b/PROMS/VEPROMS.CSLA.Library/Generated/RoleAssignment.cs
index a7fc0b23..85aad5eb 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/RoleAssignment.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/RoleAssignment.cs
@@ -574,6 +574,7 @@ namespace VEPROMS.CSLA.Library
 		{
 			MarkAsChild();
 			// TODO: Add any initialization & defaults
+			_AID = Assignment.NextAID;
 			_StartDate = _RoleAssignmentExtension.DefaultStartDate;
 			_DTS = _RoleAssignmentExtension.DefaultDTS;
 			_UsrID = _RoleAssignmentExtension.DefaultUsrID;
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/RoleInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/RoleInfo.cs
index 95524c04..39872032 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/RoleInfo.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/RoleInfo.cs
@@ -151,6 +151,8 @@ namespace VEPROMS.CSLA.Library
 			get
 			{
 				CanReadProperty("RoleAssignmentCount", true);
+				if (_RoleAssignmentCount < 0)
+					_RoleAssignmentCount = RoleAssignments.Count;
 				return _RoleAssignmentCount;
 			}
 		}
@@ -171,6 +173,7 @@ namespace VEPROMS.CSLA.Library
 		}
 		public void RefreshRoleAssignments()
 		{
+			_RoleAssignmentCount = -1;
 			ConvertListToDictionary();
 			if (_CacheByPrimaryKey.ContainsKey(_RID.ToString()))
 				foreach (RoleInfo tmp in _CacheByPrimaryKey[_RID.ToString()])
@@ -186,6 +189,8 @@ namespace VEPROMS.CSLA.Library
 			get
 			{
 				CanReadProperty("RolePermissionCount", true);
+				if (_RolePermissionCount < 0)
+					_RolePermissionCount = RolePermissions.Count;
 				return _RolePermissionCount;
 			}
 		}
@@ -206,6 +211,7 @@ namespace VEPROMS.CSLA.Library
 		}
 		public void RefreshRolePermissions()
 		{
+			_RolePermissionCount = -1;
 			ConvertListToDictionary();
 			if (_CacheByPrimaryKey.ContainsKey(_RID.ToString()))
 				foreach (RoleInfo tmp in _CacheByPrimaryKey[_RID.ToString()])
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/RolePermission.cs b/PROMS/VEPROMS.CSLA.Library/Generated/RolePermission.cs
index 379d7285..11cffa12 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/RolePermission.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/RolePermission.cs
@@ -453,6 +453,7 @@ namespace VEPROMS.CSLA.Library
 		{
 			MarkAsChild();
 			// TODO: Add any initialization & defaults
+			_PID = Permission.NextPID;
 			_PermAD = _RolePermissionExtension.DefaultPermAD;
 			_StartDate = _RolePermissionExtension.DefaultStartDate;
 			_DTS = _RolePermissionExtension.DefaultDTS;
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/UserInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/UserInfo.cs
index 2134f120..16da5ba5 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/UserInfo.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/UserInfo.cs
@@ -241,6 +241,8 @@ namespace VEPROMS.CSLA.Library
 			get
 			{
 				CanReadProperty("UserMembershipCount", true);
+				if (_UserMembershipCount < 0)
+					_UserMembershipCount = UserMemberships.Count;
 				return _UserMembershipCount;
 			}
 		}
@@ -261,6 +263,7 @@ namespace VEPROMS.CSLA.Library
 		}
 		public void RefreshUserMemberships()
 		{
+			_UserMembershipCount = -1;
 			ConvertListToDictionary();
 			if (_CacheByPrimaryKey.ContainsKey(_UID.ToString()))
 				foreach (UserInfo tmp in _CacheByPrimaryKey[_UID.ToString()])
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/UserMembership.cs b/PROMS/VEPROMS.CSLA.Library/Generated/UserMembership.cs
index 3071fc6d..67304498 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/UserMembership.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/UserMembership.cs
@@ -455,6 +455,7 @@ namespace VEPROMS.CSLA.Library
 		{
 			MarkAsChild();
 			// TODO: Add any initialization & defaults
+			_UGID = Membership.NextUGID;
 			_StartDate = _UserMembershipExtension.DefaultStartDate;
 			_DTS = _UserMembershipExtension.DefaultDTS;
 			_UsrID = _UserMembershipExtension.DefaultUsrID;