diff --git a/GBM/Managers/mgrSQLite.vb b/GBM/Managers/mgrSQLite.vb
index 7c498ad..d2837c4 100644
--- a/GBM/Managers/mgrSQLite.vb
+++ b/GBM/Managers/mgrSQLite.vb
@@ -98,6 +98,9 @@ Public Class mgrSQLite
             sSql &= "CREATE TABLE manifest (ManifestID TEXT NOT NULL PRIMARY KEY, Name TEXT NOT NULL, FileName TEXT NOT NULL, RestorePath TEXT NOT NULL, " &
                    "AbsolutePath BOOLEAN NOT NULL, DateUpdated TEXT NOT NULL, UpdatedBy TEXT NOT NULL, CheckSum TEXT);"
 
+            'Add Tables (Sessions)
+            sSql &= "CREATE TABLE sessions (MonitorID TEXT NOT NULL, Start INTEGER NOT NULL, End INTEGER NOT NULL, PRIMARY KEY(MonitorID, Start));"
+
             'Set Version
             sSql &= "PRAGMA user_version=" & mgrCommon.AppVersion
 
@@ -132,10 +135,6 @@ Public Class mgrSQLite
             'Add Tables (Remote Game Tags)
             sSql &= "CREATE TABLE gametags (TagID TEXT NOT NULL, MonitorID TEXT NOT NULL, PRIMARY KEY(TagID, MonitorID)); "
 
-            'Add Tables (Sessions)
-            sSql &= "CREATE TABLE sessions (MonitorID TEXT NOT NULL, Start INTEGER NOT NULL, End INTEGER NOT NULL, " &
-                    "ComputerName TEXT NOT NULL, PRIMARY KEY(MonitorID, Start));"
-
             'Set Version
             sSql &= "PRAGMA user_version=" & mgrCommon.AppVersion
 
@@ -690,8 +689,11 @@ Public Class mgrSQLite
                 'Backup DB before starting
                 BackupDB("v102")
 
+                'Add Tables (Sessions)
+                sSQL = "CREATE TABLE sessions (MonitorID TEXT NOT NULL, Start INTEGER NOT NULL, End INTEGER NOT NULL, PRIMARY KEY(MonitorID, Start));"
+
                 'Add new field(s)
-                sSQL = "ALTER TABLE monitorlist ADD COLUMN Comments TEXT;"
+                sSQL &= "ALTER TABLE monitorlist ADD COLUMN Comments TEXT;"
 
                 sSQL &= "PRAGMA user_version=105"
 
@@ -701,12 +703,8 @@ Public Class mgrSQLite
                 'Backup DB before starting
                 BackupDB("v102")
 
-                'Add Tables (Sessions)
-                sSQL = "CREATE TABLE sessions (MonitorID TEXT NOT NULL, Start INTEGER NOT NULL, End INTEGER NOT NULL, " &
-                       "ComputerName TEXT NOT NULL, PRIMARY KEY(MonitorID, Start));"
-
                 'Add new field(s)
-                sSQL &= "ALTER TABLE monitorlist ADD COLUMN Comments TEXT;"
+                sSQL = "ALTER TABLE monitorlist ADD COLUMN Comments TEXT;"
 
                 sSQL &= "PRAGMA user_version=105"
 
diff --git a/GBM/Managers/mgrSessions.vb b/GBM/Managers/mgrSessions.vb
index e33c785..b87c884 100644
--- a/GBM/Managers/mgrSessions.vb
+++ b/GBM/Managers/mgrSessions.vb
@@ -22,8 +22,8 @@
         Return hshParams
     End Function
 
-    Public Shared Sub AddSession(ByVal oSession As clsSession)
-        Dim oDatabase As New mgrSQLite(mgrSQLite.Database.Remote)
+    Public Shared Sub AddSession(ByVal oSession As clsSession, Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local)
+        Dim oDatabase As New mgrSQLite(iSelectDB)
         Dim sSQL As String
         Dim hshParams As Hashtable
 
@@ -34,8 +34,8 @@
         oDatabase.RunParamQuery(sSQL, hshParams)
     End Sub
 
-    Public Shared Function GetSessionsByGame(ByVal sMonitorID As String) As DataSet
-        Dim oDatabase As New mgrSQLite(mgrSQLite.Database.Remote)
+    Public Shared Function GetSessionsByGame(ByVal sMonitorID As String, Optional ByVal iSelectDB As mgrSQLite.Database = mgrSQLite.Database.Local) As DataSet
+        Dim oDatabase As New mgrSQLite(iSelectDB)
         Dim sSQL As String
         Dim hshParams As New Hashtable