diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationInfo.cs
index 4fb9c461..8e72df2b 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationInfo.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/AnnotationInfo.cs
@@ -268,8 +268,16 @@ namespace VEPROMS.CSLA.Library
 			_DTS = tmp.DTS;
 			_UserID = tmp.UserID;
 			_AnnotationInfoExtension.Refresh(this);
-			_MyItem = null;
-			_MyAnnotationType = null;
+			if(_MyItem != null)
+			{
+				_MyItem.Dispose();// Dispose related value
+				_MyItem = null;// Reset related value
+			}
+			if(_MyAnnotationType != null)
+			{
+				_MyAnnotationType.Dispose();// Dispose related value
+				_MyAnnotationType = null;// Reset related value
+			}
 			OnChange();// raise an event
 		}
 		public static void Refresh(AnnotationTypeAnnotation tmp)
@@ -295,8 +303,16 @@ namespace VEPROMS.CSLA.Library
 			_DTS = tmp.DTS;
 			_UserID = tmp.UserID;
 			_AnnotationInfoExtension.Refresh(this);
-			_MyItem = null;
-			_MyAnnotationType = null;
+			if(_MyItem != null)
+			{
+				_MyItem.Dispose();// Dispose related value
+				_MyItem = null;// Reset related value
+			}
+			if(_MyAnnotationType != null)
+			{
+				_MyAnnotationType.Dispose();// Dispose related value
+				_MyAnnotationType = null;// Reset related value
+			}
 			OnChange();// raise an event
 		}
 		public static void Refresh(ItemAnnotation tmp)
@@ -322,8 +338,16 @@ namespace VEPROMS.CSLA.Library
 			_DTS = tmp.DTS;
 			_UserID = tmp.UserID;
 			_AnnotationInfoExtension.Refresh(this);
-			_MyItem = null;
-			_MyAnnotationType = null;
+			if(_MyItem != null)
+			{
+				_MyItem.Dispose();// Dispose related value
+				_MyItem = null;// Reset related value
+			}
+			if(_MyAnnotationType != null)
+			{
+				_MyAnnotationType.Dispose();// Dispose related value
+				_MyAnnotationType = null;// Reset related value
+			}
 			OnChange();// raise an event
 		}
 		public static AnnotationInfo Get(int annotationID)
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/AssignmentInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/AssignmentInfo.cs
index 5dd70dc3..2ebb9017 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/AssignmentInfo.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/AssignmentInfo.cs
@@ -286,9 +286,21 @@ namespace VEPROMS.CSLA.Library
 			_DTS = tmp.DTS;
 			_UsrID = tmp.UsrID;
 			_AssignmentInfoExtension.Refresh(this);
-			_MyGroup = null;
-			_MyRole = null;
-			_MyFolder = null;
+			if(_MyGroup != null)
+			{
+				_MyGroup.Dispose();// Dispose related value
+				_MyGroup = null;// Reset related value
+			}
+			if(_MyRole != null)
+			{
+				_MyRole.Dispose();// Dispose related value
+				_MyRole = null;// Reset related value
+			}
+			if(_MyFolder != null)
+			{
+				_MyFolder.Dispose();// Dispose related value
+				_MyFolder = null;// Reset related value
+			}
 			OnChange();// raise an event
 		}
 		public static void Refresh(FolderAssignment tmp)
@@ -320,9 +332,21 @@ namespace VEPROMS.CSLA.Library
 			_DTS = tmp.DTS;
 			_UsrID = tmp.UsrID;
 			_AssignmentInfoExtension.Refresh(this);
-			_MyGroup = null;
-			_MyRole = null;
-			_MyFolder = null;
+			if(_MyGroup != null)
+			{
+				_MyGroup.Dispose();// Dispose related value
+				_MyGroup = null;// Reset related value
+			}
+			if(_MyRole != null)
+			{
+				_MyRole.Dispose();// Dispose related value
+				_MyRole = null;// Reset related value
+			}
+			if(_MyFolder != null)
+			{
+				_MyFolder.Dispose();// Dispose related value
+				_MyFolder = null;// Reset related value
+			}
 			OnChange();// raise an event
 		}
 		public static void Refresh(GroupAssignment tmp)
@@ -354,9 +378,21 @@ namespace VEPROMS.CSLA.Library
 			_DTS = tmp.DTS;
 			_UsrID = tmp.UsrID;
 			_AssignmentInfoExtension.Refresh(this);
-			_MyGroup = null;
-			_MyRole = null;
-			_MyFolder = null;
+			if(_MyGroup != null)
+			{
+				_MyGroup.Dispose();// Dispose related value
+				_MyGroup = null;// Reset related value
+			}
+			if(_MyRole != null)
+			{
+				_MyRole.Dispose();// Dispose related value
+				_MyRole = null;// Reset related value
+			}
+			if(_MyFolder != null)
+			{
+				_MyFolder.Dispose();// Dispose related value
+				_MyFolder = null;// Reset related value
+			}
 			OnChange();// raise an event
 		}
 		public static void Refresh(RoleAssignment tmp)
@@ -388,9 +424,21 @@ namespace VEPROMS.CSLA.Library
 			_DTS = tmp.DTS;
 			_UsrID = tmp.UsrID;
 			_AssignmentInfoExtension.Refresh(this);
-			_MyGroup = null;
-			_MyRole = null;
-			_MyFolder = null;
+			if(_MyGroup != null)
+			{
+				_MyGroup.Dispose();// Dispose related value
+				_MyGroup = null;// Reset related value
+			}
+			if(_MyRole != null)
+			{
+				_MyRole.Dispose();// Dispose related value
+				_MyRole = null;// Reset related value
+			}
+			if(_MyFolder != null)
+			{
+				_MyFolder.Dispose();// Dispose related value
+				_MyFolder = null;// Reset related value
+			}
 			OnChange();// raise an event
 		}
 		public static AssignmentInfo Get(int aid)
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ContentInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ContentInfo.cs
index b4a1c950..c2aad309 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/ContentInfo.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/ContentInfo.cs
@@ -486,10 +486,22 @@ namespace VEPROMS.CSLA.Library
 			_DTS = tmp.DTS;
 			_UserID = tmp.UserID;
 			_ContentInfoExtension.Refresh(this);
-			_MyFormat = null;
-			_MyEntry = null;// Reset related value
+			if(_MyFormat != null)
+			{
+				_MyFormat.Dispose();// Dispose related value
+				_MyFormat = null;// Reset related value
+			}
+			if(_MyEntry != null)
+			{
+				_MyEntry.Dispose();// Dispose related value
+				_MyEntry = null;// Reset related value
+			}
 			_ContentEntryCount = -1;// Reset Count
-			_MyZContent = null;// Reset related value
+			if(_MyZContent != null)
+			{
+				_MyZContent.Dispose();// Dispose related value
+				_MyZContent = null;// Reset related value
+			}
 			_ContentZContentCount = -1;// Reset Count
 			OnChange();// raise an event
 		}
@@ -510,10 +522,22 @@ namespace VEPROMS.CSLA.Library
 			_DTS = tmp.DTS;
 			_UserID = tmp.UserID;
 			_ContentInfoExtension.Refresh(this);
-			_MyFormat = null;
-			_MyEntry = null;// Reset related value
+			if(_MyFormat != null)
+			{
+				_MyFormat.Dispose();// Dispose related value
+				_MyFormat = null;// Reset related value
+			}
+			if(_MyEntry != null)
+			{
+				_MyEntry.Dispose();// Dispose related value
+				_MyEntry = null;// Reset related value
+			}
 			_ContentEntryCount = -1;// Reset Count
-			_MyZContent = null;// Reset related value
+			if(_MyZContent != null)
+			{
+				_MyZContent.Dispose();// Dispose related value
+				_MyZContent = null;// Reset related value
+			}
 			_ContentZContentCount = -1;// Reset Count
 			OnChange();// raise an event
 		}
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/DetailInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/DetailInfo.cs
index 2ecc4df3..3780ac9e 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/DetailInfo.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/DetailInfo.cs
@@ -239,7 +239,11 @@ namespace VEPROMS.CSLA.Library
 			_DTS = tmp.DTS;
 			_UserID = tmp.UserID;
 			_DetailInfoExtension.Refresh(this);
-			_MyContent = null;
+			if(_MyContent != null)
+			{
+				_MyContent.Dispose();// Dispose related value
+				_MyContent = null;// Reset related value
+			}
 			OnChange();// raise an event
 		}
 		public static void Refresh(ContentDetail tmp)
@@ -258,7 +262,11 @@ namespace VEPROMS.CSLA.Library
 			_DTS = tmp.DTS;
 			_UserID = tmp.UserID;
 			_DetailInfoExtension.Refresh(this);
-			_MyContent = null;
+			if(_MyContent != null)
+			{
+				_MyContent.Dispose();// Dispose related value
+				_MyContent = null;// Reset related value
+			}
 			OnChange();// raise an event
 		}
 		public static DetailInfo Get(int detailID)