diff --git a/SacsStandardBase/Base/App/SacsSessionConfig.cs b/SacsStandardBase/Base/App/SacsAppConfig.cs
similarity index 88%
rename from SacsStandardBase/Base/App/SacsSessionConfig.cs
rename to SacsStandardBase/Base/App/SacsAppConfig.cs
index f860608..2ad812d 100644
--- a/SacsStandardBase/Base/App/SacsSessionConfig.cs
+++ b/SacsStandardBase/Base/App/SacsAppConfig.cs
@@ -2,11 +2,11 @@
 {
 	//=======================================================================
 	//[Serializable()]
-	public class SacsSessionConfig
+	public class SacsAppConfig
 	{
 		//-------------------------------------------------------------------
 		// Construction.
-		protected SacsSessionConfig ()
+		protected SacsAppConfig ()
 		{
 		}
 
diff --git a/SacsStandardDbas/Dbas/Security/SaSecurityConsole_Dbas.cs b/SacsStandardDbas/Dbas/Security/SaSecurityConsole_Dbas.cs
index 422e8c7..625715b 100644
--- a/SacsStandardDbas/Dbas/Security/SaSecurityConsole_Dbas.cs
+++ b/SacsStandardDbas/Dbas/Security/SaSecurityConsole_Dbas.cs
@@ -5,7 +5,6 @@ using Sarand.Net.Standard.Base.Core;
 using Sarand.Net.Standard.Base.Bus;
 using Sarand.Net.Standard.Base.Dbas;
 using Sarand.Net.Standard.Base.Security;
-using Sarand.Net.Standard.Dbas.Base;
 using Sarand.Net.Standard.Dbas.Utils;
 using Sarand.Net.Standard.Base.Utils;
 
@@ -20,7 +19,7 @@ namespace Sarand.Net.Standard.Dbas.Security
 
 		//-------------------------------------------------------------------
 		// Protected construction - use derived class.
-		protected SaSecurityConsole_Dbas(SacsDatabase database)
+		protected SaSecurityConsole_Dbas(ISacsDatabase database)
 		{
 			Database = database;
 			// Initialise security manager.
@@ -37,7 +36,7 @@ namespace Sarand.Net.Standard.Dbas.Security
 
 		//-------------------------------------------------------------------
 		// Database properties.
-		internal SacsDatabase Database { get; set; }
+		internal ISacsDatabase Database { get; set; }
 		public override bool DatabaseIsValid { get { return securityMgr.DatabaseIsValid; } }
 		public override bool CanUpdateDatabase { get { return securityMgr.CanUpdateDatabase; } }
 		public override bool ColumnExists(SaSecurityDbDfn.ColumnIdx columnIdx)
diff --git a/SacsStandardDbas/Dbas/Security/SaSecurityMgr_Dbas.cs b/SacsStandardDbas/Dbas/Security/SaSecurityMgr_Dbas.cs
index 6768f53..a6fec1f 100644
--- a/SacsStandardDbas/Dbas/Security/SaSecurityMgr_Dbas.cs
+++ b/SacsStandardDbas/Dbas/Security/SaSecurityMgr_Dbas.cs
@@ -1,15 +1,9 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Common;
 using System.Linq;
-using Sarand.Net.Standard.Base.App;
-using Sarand.Net.Standard.Base.Core;
-using Sarand.Net.Standard.Base.Bus;
 using Sarand.Net.Standard.Base.Dbas;
 using Sarand.Net.Standard.Base.Security;
-using Sarand.Net.Standard.Dbas.Base;
 using Sarand.Net.Standard.Dbas.Data;
-using Sarand.Net.Standard.Dbas.Security.Internal;
 
 namespace Sarand.Net.Standard.Dbas.Security
 {
@@ -30,7 +24,7 @@ namespace Sarand.Net.Standard.Dbas.Security
 		//-------------------------------------------------------------------
 		// Properties.
 		internal SaSecurityConsole_Dbas SecurityConsole { get; }
-		internal SacsDatabase Database { get { return SecurityConsole.Database; } }
+		internal ISacsDatabase Database { get { return SecurityConsole.Database; } }
 		private DbDataItem.DatabaseInfo DbInfo { get; }
 		public String TableName_SecItem { get { return SaSecurityDbDfn.GetTableName(SaSecurityDbDfn.TableIdx.SaSecItem); } }
 		public String TableName_SecLink { get { return SaSecurityDbDfn.GetTableName(SaSecurityDbDfn.TableIdx.SaSecLink); } }
diff --git a/SacsStandardDbas/Dbas/UpdateLog/SaUpdateLogConsole_Dbas.cs b/SacsStandardDbas/Dbas/UpdateLog/SaUpdateLogConsole_Dbas.cs
index 0ecc5dd..28ad7c7 100644
--- a/SacsStandardDbas/Dbas/UpdateLog/SaUpdateLogConsole_Dbas.cs
+++ b/SacsStandardDbas/Dbas/UpdateLog/SaUpdateLogConsole_Dbas.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using Sarand.Net.Standard.Base.Bus;
 using Sarand.Net.Standard.Base.Dbas;
 using Sarand.Net.Standard.Base.UpdateLog;
-using Sarand.Net.Standard.Dbas.Base;
 
 namespace Sarand.Net.Standard.Dbas.UpdateLog
 {
@@ -22,7 +21,7 @@ namespace Sarand.Net.Standard.Dbas.UpdateLog
 
 		//-------------------------------------------------------------------
 		// Construction.
-		protected SaUpdateLogConsole_Dbas (SacsDatabase database)
+		protected SaUpdateLogConsole_Dbas (ISacsDatabase database)
 		{
 			Database = database;
 			updateLogMgr = new SaUpdateLogMgr_Dbas(this);
@@ -38,7 +37,7 @@ namespace Sarand.Net.Standard.Dbas.UpdateLog
 
 		//-------------------------------------------------------------------
 		// Properties.
-		internal SacsDatabase Database { get; set; }
+		internal ISacsDatabase Database { get; set; }
 		public override bool DatabaseIsValid { get { return updateLogMgr.DatabaseIsValid; } }
 		public override bool CanUpdateDatabase { get { return updateLogMgr.CanUpdateDatabase; } }
 
diff --git a/SacsStandardDbas/Dbas/UpdateLog/SaUpdateLogMgr_Dbas.cs b/SacsStandardDbas/Dbas/UpdateLog/SaUpdateLogMgr_Dbas.cs
index 0745bd5..3faaf38 100644
--- a/SacsStandardDbas/Dbas/UpdateLog/SaUpdateLogMgr_Dbas.cs
+++ b/SacsStandardDbas/Dbas/UpdateLog/SaUpdateLogMgr_Dbas.cs
@@ -38,7 +38,7 @@ namespace Sarand.Net.Standard.Dbas.UpdateLog
 		//-------------------------------------------------------------------
 		// Properties.
 		public String TableName_UpdateLog { get { return SaUpdateLogDbDfn.GetTableName(SaUpdateLogDbDfn.TableIdx.SaAttrUpdate); } }
-		internal SacsDatabase Database { get; }
+		internal ISacsDatabase Database { get; }
 		private DbDataItem.DatabaseInfo DbInfo { get; }
 		public override bool DatabaseIsValid { get { return (Database != null && Database.GetTableNames().Contains(TableName_UpdateLog)); } }
 		public override bool CanUpdateDatabase { get { return DatabaseIsValid; } }