diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ContentInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ContentInfo.cs
index 008cc646..0d1dd5af 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/ContentInfo.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/ContentInfo.cs
@@ -627,22 +627,14 @@ namespace VEPROMS.CSLA.Library
 					if (tmp.LocalEntry != null && tmpInfo.MyEntry != null && tmp.MyEntry.MyDocument.DocID != tmpInfo.MyEntry.MyDocument.DocID)
 						EntryInfo.Refresh(tmp.MyEntry);
 				}
+				// Update Enhanced Document Text
 				StepConfig sc = new StepConfig(tmp.Config);
-				if (sc.Step_SourceToBackground != null)
-				{
-					int s2b = int.Parse(sc.Step_SourceToBackground);
-					ItemInfo iib = ItemInfo.Get(s2b);
-					Content cb = Content.Get(iib.MyContent.ContentID);
-					cb.Text = tmp.Text;
-					cb.Save();
-				}
-				if (sc.Step_SourceToDeviation != null)
-				{
-					int s2d = int.Parse(sc.Step_SourceToDeviation);
-					ItemInfo iid = ItemInfo.Get(s2d);
-					Content cd = Content.Get(iid.MyContent.ContentID);
-					cd.Text = tmp.Text;
-					cd.Save();
+				foreach (EnhancedDocument ed in sc.MyEnhancedDocuments)
+				{ // The following should be replaced by KBR
+					ItemInfo ii = ItemInfo.Get(ed.ItemID);
+					Content cc = ii.MyContent.Get();
+					cc.Text = tmp.Text;
+					cc.Save();
 				}
 		}
 		protected virtual void RefreshFields(Content tmp)
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Database.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Database.cs
index 58a21125..8f692ccb 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/Database.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/Database.cs
@@ -157,7 +157,7 @@ namespace VEPROMS.CSLA.Library
 		}
 		private static string FixServer(string connectionString)
 		{
-			string serverName = Volian.Base.Library.VlnSettings.GetCommand("Server",null);
+			string serverName = Volian.Base.Library.VlnSettings.GetServer();
 			if (serverName != null && serverName != "")
 			{
 				System.Text.RegularExpressions.Match mServer = System.Text.RegularExpressions.Regex.Match(connectionString, ".*Data Source=([^;]*).*");
diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Document.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Document.cs
index 902975ec..c4a34f37 100644
--- a/PROMS/VEPROMS.CSLA.Library/Generated/Document.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Generated/Document.cs
@@ -692,18 +692,19 @@ namespace VEPROMS.CSLA.Library
 			}
 			return tmp;
 		}
-		public static Document New(string libTitle, byte[] docContent, string docAscii, string config)
+		public static Document New(string libTitle, byte[] docContent, string docAscii, string config, string extension)
 		{
 			Document tmp = Document.New();
 			tmp.LibTitle = libTitle;
 			tmp.DocContent = docContent;
 			tmp.DocAscii = docAscii;
 			tmp.Config = config;
+			tmp.FileExtension = extension;
 			return tmp;
 		}
-		public static Document MakeDocument(string libTitle, byte[] docContent, string docAscii, string config)
+		public static Document MakeDocument(string libTitle, byte[] docContent, string docAscii, string config, string extension)
 		{
-			Document tmp = Document.New(libTitle, docContent, docAscii, config);
+			Document tmp = Document.New(libTitle, docContent, docAscii, config, extension);
 			if (tmp.IsSavable)
 				tmp = tmp.Save();
 			else