diff --git a/.gitignore b/.gitignore
index 0a61c34..5112fe0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ wwwroot/translations/
 config/userConfig.json
 CarCareTracker.csproj.user
 Properties/launchSettings.json
+data/cartracker-log.db
diff --git a/External/Implementations/Litedb/CollisionRecordDataAccess.cs b/External/Implementations/Litedb/CollisionRecordDataAccess.cs
index 95a4498..eab285a 100644
--- a/External/Implementations/Litedb/CollisionRecordDataAccess.cs
+++ b/External/Implementations/Litedb/CollisionRecordDataAccess.cs
@@ -7,51 +7,40 @@ namespace CarCareTracker.External.Implementations
 {
     public class CollisionRecordDataAccess : ICollisionRecordDataAccess
     {
-        private static string dbName = StaticHelper.DbName;
+        private LiteDatabase db { get; set; }
         private static string tableName = "collisionrecords";
+        public CollisionRecordDataAccess(ILiteDBInjection liteDB)
+        {
+            db = liteDB.GetLiteDB();
+        }
         public List<CollisionRecord> GetCollisionRecordsByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<CollisionRecord>(tableName);
-                var collisionRecords = table.Find(Query.EQ(nameof(CollisionRecord.VehicleId), vehicleId));
-                return collisionRecords.ToList() ?? new List<CollisionRecord>();
-            };
+            var table = db.GetCollection<CollisionRecord>(tableName);
+            var collisionRecords = table.Find(Query.EQ(nameof(CollisionRecord.VehicleId), vehicleId));
+            return collisionRecords.ToList() ?? new List<CollisionRecord>();
         }
         public CollisionRecord GetCollisionRecordById(int collisionRecordId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<CollisionRecord>(tableName);
-                return table.FindById(collisionRecordId);
-            };
+            var table = db.GetCollection<CollisionRecord>(tableName);
+            return table.FindById(collisionRecordId);
         }
         public bool DeleteCollisionRecordById(int collisionRecordId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<CollisionRecord>(tableName);
-                table.Delete(collisionRecordId);
-                return true;
-            };
+            var table = db.GetCollection<CollisionRecord>(tableName);
+            table.Delete(collisionRecordId);
+            return true;
         }
         public bool SaveCollisionRecordToVehicle(CollisionRecord collisionRecord)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<CollisionRecord>(tableName);
-                table.Upsert(collisionRecord);
-                return true;
-            };
+            var table = db.GetCollection<CollisionRecord>(tableName);
+            table.Upsert(collisionRecord);
+            return true;
         }
         public bool DeleteAllCollisionRecordsByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<CollisionRecord>(tableName);
-                var collisionRecords = table.DeleteMany(Query.EQ(nameof(CollisionRecord.VehicleId), vehicleId));
-                return true;
-            };
+            var table = db.GetCollection<CollisionRecord>(tableName);
+            var collisionRecords = table.DeleteMany(Query.EQ(nameof(CollisionRecord.VehicleId), vehicleId));
+            return true;
         }
     }
 }
diff --git a/External/Implementations/Litedb/ExtraFieldDataAccess.cs b/External/Implementations/Litedb/ExtraFieldDataAccess.cs
index c55d410..d5364a3 100644
--- a/External/Implementations/Litedb/ExtraFieldDataAccess.cs
+++ b/External/Implementations/Litedb/ExtraFieldDataAccess.cs
@@ -5,26 +5,24 @@ using LiteDB;
 
 namespace CarCareTracker.External.Implementations
 {
-    public class ExtraFieldDataAccess: IExtraFieldDataAccess
+    public class ExtraFieldDataAccess : IExtraFieldDataAccess
     {
-        private static string dbName = StaticHelper.DbName;
+        private LiteDatabase db { get; set; }
         private static string tableName = "extrafields";
+        public ExtraFieldDataAccess(ILiteDBInjection liteDB)
+        {
+            db = liteDB.GetLiteDB();
+        }
         public RecordExtraField GetExtraFieldsById(int importMode)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<RecordExtraField>(tableName);
-                return table.FindById(importMode) ?? new RecordExtraField();
-            };
+            var table = db.GetCollection<RecordExtraField>(tableName);
+            return table.FindById(importMode) ?? new RecordExtraField();
         }
         public bool SaveExtraFields(RecordExtraField record)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<RecordExtraField>(tableName);
-                table.Upsert(record);
-                return true;
-            };
+            var table = db.GetCollection<RecordExtraField>(tableName);
+            table.Upsert(record);
+            return true;
         }
     }
 }
diff --git a/External/Implementations/Litedb/GasRecordDataAccess.cs b/External/Implementations/Litedb/GasRecordDataAccess.cs
index e2cec43..10fac3b 100644
--- a/External/Implementations/Litedb/GasRecordDataAccess.cs
+++ b/External/Implementations/Litedb/GasRecordDataAccess.cs
@@ -5,53 +5,42 @@ using LiteDB;
 
 namespace CarCareTracker.External.Implementations
 {
-    public class GasRecordDataAccess: IGasRecordDataAccess
+    public class GasRecordDataAccess : IGasRecordDataAccess
     {
-        private static string dbName = StaticHelper.DbName;
+        private LiteDatabase db { get; set; }
         private static string tableName = "gasrecords";
+        public GasRecordDataAccess(ILiteDBInjection liteDB)
+        {
+            db = liteDB.GetLiteDB();
+        }
         public List<GasRecord> GetGasRecordsByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<GasRecord>(tableName);
-                var gasRecords = table.Find(Query.EQ(nameof(GasRecord.VehicleId), vehicleId));
-                return gasRecords.ToList() ?? new List<GasRecord>();
-            };
+            var table = db.GetCollection<GasRecord>(tableName);
+            var gasRecords = table.Find(Query.EQ(nameof(GasRecord.VehicleId), vehicleId));
+            return gasRecords.ToList() ?? new List<GasRecord>();
         }
         public GasRecord GetGasRecordById(int gasRecordId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<GasRecord>(tableName);
-                return table.FindById(gasRecordId);
-            };
+            var table = db.GetCollection<GasRecord>(tableName);
+            return table.FindById(gasRecordId);
         }
         public bool DeleteGasRecordById(int gasRecordId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<GasRecord>(tableName);
-                table.Delete(gasRecordId);
-                return true;
-            };
+            var table = db.GetCollection<GasRecord>(tableName);
+            table.Delete(gasRecordId);
+            return true;
         }
         public bool SaveGasRecordToVehicle(GasRecord gasRecord)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<GasRecord>(tableName);
-                table.Upsert(gasRecord);
-                return true;
-            };
+            var table = db.GetCollection<GasRecord>(tableName);
+            table.Upsert(gasRecord);
+            return true;
         }
         public bool DeleteAllGasRecordsByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<GasRecord>(tableName);
-                var gasRecords = table.DeleteMany(Query.EQ(nameof(GasRecord.VehicleId), vehicleId));
-                return true;
-            };
+            var table = db.GetCollection<GasRecord>(tableName);
+            var gasRecords = table.DeleteMany(Query.EQ(nameof(GasRecord.VehicleId), vehicleId));
+            return true;
         }
     }
 }
diff --git a/External/Implementations/Litedb/LiteDBInjection.cs b/External/Implementations/Litedb/LiteDBInjection.cs
new file mode 100644
index 0000000..cf10757
--- /dev/null
+++ b/External/Implementations/Litedb/LiteDBInjection.cs
@@ -0,0 +1,22 @@
+using CarCareTracker.Helper;
+using LiteDB;
+
+namespace CarCareTracker.External.Implementations
+{
+    public interface ILiteDBInjection
+    {
+        LiteDatabase GetLiteDB();    
+    }
+    public class LiteDBInjection: ILiteDBInjection
+    {
+        public LiteDatabase db { get; set; }
+        public LiteDBInjection()
+        {
+            db = new LiteDatabase(StaticHelper.DbName);
+        }
+        public LiteDatabase GetLiteDB()
+        {
+            return db;
+        }
+    }
+}
diff --git a/External/Implementations/Litedb/NoteDataAccess.cs b/External/Implementations/Litedb/NoteDataAccess.cs
index 596cb83..56f421a 100644
--- a/External/Implementations/Litedb/NoteDataAccess.cs
+++ b/External/Implementations/Litedb/NoteDataAccess.cs
@@ -5,53 +5,42 @@ using LiteDB;
 
 namespace CarCareTracker.External.Implementations
 {
-    public class NoteDataAccess: INoteDataAccess
+    public class NoteDataAccess : INoteDataAccess
     {
-        private static string dbName = StaticHelper.DbName;
+        private LiteDatabase db { get; set; }
         private static string tableName = "notes";
+        public NoteDataAccess(ILiteDBInjection liteDB)
+        {
+            db = liteDB.GetLiteDB();
+        }
         public List<Note> GetNotesByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<Note>(tableName);
-                var noteToReturn = table.Find(Query.EQ(nameof(Note.VehicleId), vehicleId));
-                return noteToReturn.ToList() ?? new List<Note>();
-            };
+            var table = db.GetCollection<Note>(tableName);
+            var noteToReturn = table.Find(Query.EQ(nameof(Note.VehicleId), vehicleId));
+            return noteToReturn.ToList() ?? new List<Note>();
         }
         public Note GetNoteById(int noteId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<Note>(tableName);
-                return table.FindById(noteId);
-            };
+            var table = db.GetCollection<Note>(tableName);
+            return table.FindById(noteId);
         }
         public bool SaveNoteToVehicle(Note note)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<Note>(tableName);
-                table.Upsert(note);
-                return true;
-            };
+            var table = db.GetCollection<Note>(tableName);
+            table.Upsert(note);
+            return true;
         }
         public bool DeleteNoteById(int noteId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<Note>(tableName);
-                table.Delete(noteId);
-                return true;
-            };
+            var table = db.GetCollection<Note>(tableName);
+            table.Delete(noteId);
+            return true;
         }
         public bool DeleteAllNotesByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<Note>(tableName);
-                var notes = table.DeleteMany(Query.EQ(nameof(Note.VehicleId), vehicleId));
-                return true;
-            };
+            var table = db.GetCollection<Note>(tableName);
+            var notes = table.DeleteMany(Query.EQ(nameof(Note.VehicleId), vehicleId));
+            return true;
         }
     }
 }
diff --git a/External/Implementations/Litedb/OdometerRecordDataAccess.cs b/External/Implementations/Litedb/OdometerRecordDataAccess.cs
index 8695078..bb5a17d 100644
--- a/External/Implementations/Litedb/OdometerRecordDataAccess.cs
+++ b/External/Implementations/Litedb/OdometerRecordDataAccess.cs
@@ -7,51 +7,40 @@ namespace CarCareTracker.External.Implementations
 {
     public class OdometerRecordDataAccess : IOdometerRecordDataAccess
     {
-        private static string dbName = StaticHelper.DbName;
+        private LiteDatabase db { get; set; }
         private static string tableName = "odometerrecords";
+        public OdometerRecordDataAccess(ILiteDBInjection liteDB)
+        {
+            db = liteDB.GetLiteDB();
+        }
         public List<OdometerRecord> GetOdometerRecordsByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<OdometerRecord>(tableName);
-                var odometerRecords = table.Find(Query.EQ(nameof(OdometerRecord.VehicleId), vehicleId));
-                return odometerRecords.ToList() ?? new List<OdometerRecord>();
-            };
+            var table = db.GetCollection<OdometerRecord>(tableName);
+            var odometerRecords = table.Find(Query.EQ(nameof(OdometerRecord.VehicleId), vehicleId));
+            return odometerRecords.ToList() ?? new List<OdometerRecord>();
         }
         public OdometerRecord GetOdometerRecordById(int odometerRecordId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<OdometerRecord>(tableName);
-                return table.FindById(odometerRecordId);
-            };
+            var table = db.GetCollection<OdometerRecord>(tableName);
+            return table.FindById(odometerRecordId);
         }
         public bool DeleteOdometerRecordById(int odometerRecordId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<OdometerRecord>(tableName);
-                table.Delete(odometerRecordId);
-                return true;
-            };
+            var table = db.GetCollection<OdometerRecord>(tableName);
+            table.Delete(odometerRecordId);
+            return true;
         }
         public bool SaveOdometerRecordToVehicle(OdometerRecord odometerRecord)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<OdometerRecord>(tableName);
-                table.Upsert(odometerRecord);
-                return true;
-            };
+            var table = db.GetCollection<OdometerRecord>(tableName);
+            table.Upsert(odometerRecord);
+            return true;
         }
         public bool DeleteAllOdometerRecordsByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<OdometerRecord>(tableName);
-                var odometerRecords = table.DeleteMany(Query.EQ(nameof(OdometerRecord.VehicleId), vehicleId));
-                return true;
-            };
+            var table = db.GetCollection<OdometerRecord>(tableName);
+            var odometerRecords = table.DeleteMany(Query.EQ(nameof(OdometerRecord.VehicleId), vehicleId));
+            return true;
         }
     }
 }
diff --git a/External/Implementations/Litedb/PlanRecordDataAccess.cs b/External/Implementations/Litedb/PlanRecordDataAccess.cs
index 227fd14..74d75d0 100644
--- a/External/Implementations/Litedb/PlanRecordDataAccess.cs
+++ b/External/Implementations/Litedb/PlanRecordDataAccess.cs
@@ -7,51 +7,40 @@ namespace CarCareTracker.External.Implementations
 {
     public class PlanRecordDataAccess : IPlanRecordDataAccess
     {
-        private static string dbName = StaticHelper.DbName;
+        private LiteDatabase db { get; set; }
         private static string tableName = "planrecords";
+        public PlanRecordDataAccess(ILiteDBInjection liteDB)
+        {
+            db = liteDB.GetLiteDB();
+        }
         public List<PlanRecord> GetPlanRecordsByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<PlanRecord>(tableName);
-                var planRecords = table.Find(Query.EQ(nameof(PlanRecord.VehicleId), vehicleId));
-                return planRecords.ToList() ?? new List<PlanRecord>();
-            };
+            var table = db.GetCollection<PlanRecord>(tableName);
+            var planRecords = table.Find(Query.EQ(nameof(PlanRecord.VehicleId), vehicleId));
+            return planRecords.ToList() ?? new List<PlanRecord>();
         }
         public PlanRecord GetPlanRecordById(int planRecordId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<PlanRecord>(tableName);
-                return table.FindById(planRecordId);
-            };
+            var table = db.GetCollection<PlanRecord>(tableName);
+            return table.FindById(planRecordId);
         }
         public bool DeletePlanRecordById(int planRecordId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<PlanRecord>(tableName);
-                table.Delete(planRecordId);
-                return true;
-            };
+            var table = db.GetCollection<PlanRecord>(tableName);
+            table.Delete(planRecordId);
+            return true;
         }
         public bool SavePlanRecordToVehicle(PlanRecord planRecord)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<PlanRecord>(tableName);
-                table.Upsert(planRecord);
-                return true;
-            };
+            var table = db.GetCollection<PlanRecord>(tableName);
+            table.Upsert(planRecord);
+            return true;
         }
         public bool DeleteAllPlanRecordsByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<PlanRecord>(tableName);
-                var planRecords = table.DeleteMany(Query.EQ(nameof(PlanRecord.VehicleId), vehicleId));
-                return true;
-            };
+            var table = db.GetCollection<PlanRecord>(tableName);
+            var planRecords = table.DeleteMany(Query.EQ(nameof(PlanRecord.VehicleId), vehicleId));
+            return true;
         }
     }
 }
diff --git a/External/Implementations/Litedb/PlanRecordTemplateDataAccess.cs b/External/Implementations/Litedb/PlanRecordTemplateDataAccess.cs
index c11efd5..f2d154b 100644
--- a/External/Implementations/Litedb/PlanRecordTemplateDataAccess.cs
+++ b/External/Implementations/Litedb/PlanRecordTemplateDataAccess.cs
@@ -7,51 +7,40 @@ namespace CarCareTracker.External.Implementations
 {
     public class PlanRecordTemplateDataAccess : IPlanRecordTemplateDataAccess
     {
-        private static string dbName = StaticHelper.DbName;
+        private LiteDatabase db { get; set; }
         private static string tableName = "planrecordtemplates";
+        public PlanRecordTemplateDataAccess(ILiteDBInjection liteDB)
+        {
+            db = liteDB.GetLiteDB();
+        }
         public List<PlanRecordInput> GetPlanRecordTemplatesByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<PlanRecordInput>(tableName);
-                var planRecords = table.Find(Query.EQ(nameof(PlanRecordInput.VehicleId), vehicleId));
-                return planRecords.ToList() ?? new List<PlanRecordInput>();
-            };
+            var table = db.GetCollection<PlanRecordInput>(tableName);
+            var planRecords = table.Find(Query.EQ(nameof(PlanRecordInput.VehicleId), vehicleId));
+            return planRecords.ToList() ?? new List<PlanRecordInput>();
         }
         public PlanRecordInput GetPlanRecordTemplateById(int planRecordId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<PlanRecordInput>(tableName);
-                return table.FindById(planRecordId);
-            };
+            var table = db.GetCollection<PlanRecordInput>(tableName);
+            return table.FindById(planRecordId);
         }
         public bool DeletePlanRecordTemplateById(int planRecordId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<PlanRecordInput>(tableName);
-                table.Delete(planRecordId);
-                return true;
-            };
+            var table = db.GetCollection<PlanRecordInput>(tableName);
+            table.Delete(planRecordId);
+            return true;
         }
         public bool SavePlanRecordTemplateToVehicle(PlanRecordInput planRecord)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<PlanRecordInput>(tableName);
-                table.Upsert(planRecord);
-                return true;
-            };
+            var table = db.GetCollection<PlanRecordInput>(tableName);
+            table.Upsert(planRecord);
+            return true;
         }
         public bool DeleteAllPlanRecordTemplatesByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<PlanRecord>(tableName);
-                var planRecords = table.DeleteMany(Query.EQ(nameof(PlanRecordInput.VehicleId), vehicleId));
-                return true;
-            };
+            var table = db.GetCollection<PlanRecord>(tableName);
+            var planRecords = table.DeleteMany(Query.EQ(nameof(PlanRecordInput.VehicleId), vehicleId));
+            return true;
         }
     }
 }
diff --git a/External/Implementations/Litedb/ReminderRecordDataAccess.cs b/External/Implementations/Litedb/ReminderRecordDataAccess.cs
index 7bee7fa..c46d298 100644
--- a/External/Implementations/Litedb/ReminderRecordDataAccess.cs
+++ b/External/Implementations/Litedb/ReminderRecordDataAccess.cs
@@ -7,51 +7,40 @@ namespace CarCareTracker.External.Implementations
 {
     public class ReminderRecordDataAccess : IReminderRecordDataAccess
     {
-        private static string dbName = StaticHelper.DbName;
+        private LiteDatabase db { get; set; }
         private static string tableName = "reminderrecords";
+        public ReminderRecordDataAccess(ILiteDBInjection liteDB)
+        {
+            db = liteDB.GetLiteDB();
+        }
         public List<ReminderRecord> GetReminderRecordsByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<ReminderRecord>(tableName);
-                var reminderRecords = table.Find(Query.EQ(nameof(ReminderRecord.VehicleId), vehicleId));
-                return reminderRecords.ToList() ?? new List<ReminderRecord>();
-            };
+            var table = db.GetCollection<ReminderRecord>(tableName);
+            var reminderRecords = table.Find(Query.EQ(nameof(ReminderRecord.VehicleId), vehicleId));
+            return reminderRecords.ToList() ?? new List<ReminderRecord>();
         }
         public ReminderRecord GetReminderRecordById(int reminderRecordId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<ReminderRecord>(tableName);
-                return table.FindById(reminderRecordId);
-            };
+            var table = db.GetCollection<ReminderRecord>(tableName);
+            return table.FindById(reminderRecordId);
         }
         public bool DeleteReminderRecordById(int reminderRecordId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<ReminderRecord>(tableName);
-                table.Delete(reminderRecordId);
-                return true;
-            };
+            var table = db.GetCollection<ReminderRecord>(tableName);
+            table.Delete(reminderRecordId);
+            return true;
         }
         public bool SaveReminderRecordToVehicle(ReminderRecord reminderRecord)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<ReminderRecord>(tableName);
-                table.Upsert(reminderRecord);
-                return true;
-            };
+            var table = db.GetCollection<ReminderRecord>(tableName);
+            table.Upsert(reminderRecord);
+            return true;
         }
         public bool DeleteAllReminderRecordsByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<ReminderRecord>(tableName);
-                var reminderRecords = table.DeleteMany(Query.EQ(nameof(ReminderRecord.VehicleId), vehicleId));
-                return true;
-            };
+            var table = db.GetCollection<ReminderRecord>(tableName);
+            var reminderRecords = table.DeleteMany(Query.EQ(nameof(ReminderRecord.VehicleId), vehicleId));
+            return true;
         }
     }
 }
diff --git a/External/Implementations/Litedb/ServiceRecordDataAccess.cs b/External/Implementations/Litedb/ServiceRecordDataAccess.cs
index e1e1017..be1709c 100644
--- a/External/Implementations/Litedb/ServiceRecordDataAccess.cs
+++ b/External/Implementations/Litedb/ServiceRecordDataAccess.cs
@@ -1,57 +1,45 @@
 using CarCareTracker.External.Interfaces;
-using CarCareTracker.Helper;
 using CarCareTracker.Models;
 using LiteDB;
 
 namespace CarCareTracker.External.Implementations
 {
-    public class ServiceRecordDataAccess: IServiceRecordDataAccess
+    public class ServiceRecordDataAccess : IServiceRecordDataAccess
     {
-        private static string dbName = StaticHelper.DbName;
+        private LiteDatabase db { get; set; }
         private static string tableName = "servicerecords";
+        public ServiceRecordDataAccess(ILiteDBInjection liteDB)
+        {
+            db = liteDB.GetLiteDB();
+        }
         public List<ServiceRecord> GetServiceRecordsByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<ServiceRecord>(tableName);
-                var serviceRecords = table.Find(Query.EQ(nameof(ServiceRecord.VehicleId), vehicleId));
-                return serviceRecords.ToList() ?? new List<ServiceRecord>();
-            };
+            var table = db.GetCollection<ServiceRecord>(tableName);
+            var serviceRecords = table.Find(Query.EQ(nameof(ServiceRecord.VehicleId), vehicleId));
+            return serviceRecords.ToList() ?? new List<ServiceRecord>();
         }
         public ServiceRecord GetServiceRecordById(int serviceRecordId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<ServiceRecord>(tableName);
-                return table.FindById(serviceRecordId);
-            };
+            var table = db.GetCollection<ServiceRecord>(tableName);
+            return table.FindById(serviceRecordId);
         }
         public bool DeleteServiceRecordById(int serviceRecordId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<ServiceRecord>(tableName);
-                table.Delete(serviceRecordId);
-                return true;
-            };
+            var table = db.GetCollection<ServiceRecord>(tableName);
+            table.Delete(serviceRecordId);
+            return true;
         }
         public bool SaveServiceRecordToVehicle(ServiceRecord serviceRecord)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<ServiceRecord>(tableName);
-                table.Upsert(serviceRecord);
-                return true;
-            };
+            var table = db.GetCollection<ServiceRecord>(tableName);
+            table.Upsert(serviceRecord);
+            return true;
         }
         public bool DeleteAllServiceRecordsByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<ServiceRecord>(tableName);
-                var serviceRecords = table.DeleteMany(Query.EQ(nameof(ServiceRecord.VehicleId), vehicleId));
-                return true;
-            };
+            var table = db.GetCollection<ServiceRecord>(tableName);
+            var serviceRecords = table.DeleteMany(Query.EQ(nameof(ServiceRecord.VehicleId), vehicleId));
+            return true;
         }
     }
 }
diff --git a/External/Implementations/Litedb/SupplyRecordDataAccess.cs b/External/Implementations/Litedb/SupplyRecordDataAccess.cs
index 2976ceb..4547511 100644
--- a/External/Implementations/Litedb/SupplyRecordDataAccess.cs
+++ b/External/Implementations/Litedb/SupplyRecordDataAccess.cs
@@ -7,51 +7,40 @@ namespace CarCareTracker.External.Implementations
 {
     public class SupplyRecordDataAccess : ISupplyRecordDataAccess
     {
-        private static string dbName = StaticHelper.DbName;
+        private LiteDatabase db { get; set; }
         private static string tableName = "supplyrecords";
+        public SupplyRecordDataAccess(ILiteDBInjection liteDB)
+        {
+            db = liteDB.GetLiteDB();
+        }
         public List<SupplyRecord> GetSupplyRecordsByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<SupplyRecord>(tableName);
-                var supplyRecords = table.Find(Query.EQ(nameof(SupplyRecord.VehicleId), vehicleId));
-                return supplyRecords.ToList() ?? new List<SupplyRecord>();
-            };
+            var table = db.GetCollection<SupplyRecord>(tableName);
+            var supplyRecords = table.Find(Query.EQ(nameof(SupplyRecord.VehicleId), vehicleId));
+            return supplyRecords.ToList() ?? new List<SupplyRecord>();
         }
         public SupplyRecord GetSupplyRecordById(int supplyRecordId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<SupplyRecord>(tableName);
-                return table.FindById(supplyRecordId);
-            };
+            var table = db.GetCollection<SupplyRecord>(tableName);
+            return table.FindById(supplyRecordId);
         }
         public bool DeleteSupplyRecordById(int supplyRecordId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<SupplyRecord>(tableName);
-                table.Delete(supplyRecordId);
-                return true;
-            };
+            var table = db.GetCollection<SupplyRecord>(tableName);
+            table.Delete(supplyRecordId);
+            return true;
         }
         public bool SaveSupplyRecordToVehicle(SupplyRecord supplyRecord)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<SupplyRecord>(tableName);
-                table.Upsert(supplyRecord);
-                return true;
-            };
+            var table = db.GetCollection<SupplyRecord>(tableName);
+            table.Upsert(supplyRecord);
+            return true;
         }
         public bool DeleteAllSupplyRecordsByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<SupplyRecord>(tableName);
-                var supplyRecords = table.DeleteMany(Query.EQ(nameof(SupplyRecord.VehicleId), vehicleId));
-                return true;
-            };
+            var table = db.GetCollection<SupplyRecord>(tableName);
+            var supplyRecords = table.DeleteMany(Query.EQ(nameof(SupplyRecord.VehicleId), vehicleId));
+            return true;
         }
     }
 }
diff --git a/External/Implementations/Litedb/TaxRecordDataAccess.cs b/External/Implementations/Litedb/TaxRecordDataAccess.cs
index 90a4b10..c836a05 100644
--- a/External/Implementations/Litedb/TaxRecordDataAccess.cs
+++ b/External/Implementations/Litedb/TaxRecordDataAccess.cs
@@ -7,51 +7,40 @@ namespace CarCareTracker.External.Implementations
 {
     public class TaxRecordDataAccess : ITaxRecordDataAccess
     {
-        private static string dbName = StaticHelper.DbName;
+        private LiteDatabase db { get; set; }
         private static string tableName = "taxrecords";
+        public TaxRecordDataAccess(ILiteDBInjection liteDB)
+        {
+            db = liteDB.GetLiteDB();
+        }
         public List<TaxRecord> GetTaxRecordsByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<TaxRecord>(tableName);
-                var taxRecords = table.Find(Query.EQ(nameof(TaxRecord.VehicleId), vehicleId));
-                return taxRecords.ToList() ?? new List<TaxRecord>();
-            };
+            var table = db.GetCollection<TaxRecord>(tableName);
+            var taxRecords = table.Find(Query.EQ(nameof(TaxRecord.VehicleId), vehicleId));
+            return taxRecords.ToList() ?? new List<TaxRecord>();
         }
         public TaxRecord GetTaxRecordById(int taxRecordId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<TaxRecord>(tableName);
-                return table.FindById(taxRecordId);
-            };
+            var table = db.GetCollection<TaxRecord>(tableName);
+            return table.FindById(taxRecordId);
         }
         public bool DeleteTaxRecordById(int taxRecordId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<TaxRecord>(tableName);
-                table.Delete(taxRecordId);
-                return true;
-            };
+            var table = db.GetCollection<TaxRecord>(tableName);
+            table.Delete(taxRecordId);
+            return true;
         }
         public bool SaveTaxRecordToVehicle(TaxRecord taxRecord)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<TaxRecord>(tableName);
-                table.Upsert(taxRecord);
-                return true;
-            };
+            var table = db.GetCollection<TaxRecord>(tableName);
+            table.Upsert(taxRecord);
+            return true;
         }
         public bool DeleteAllTaxRecordsByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<TaxRecord>(tableName);
-                var taxRecords = table.DeleteMany(Query.EQ(nameof(TaxRecord.VehicleId), vehicleId));
-                return true;
-            };
+            var table = db.GetCollection<TaxRecord>(tableName);
+            var taxRecords = table.DeleteMany(Query.EQ(nameof(TaxRecord.VehicleId), vehicleId));
+            return true;
         }
     }
 }
diff --git a/External/Implementations/Litedb/TokenRecordDataAccess.cs b/External/Implementations/Litedb/TokenRecordDataAccess.cs
index 961f583..864b47d 100644
--- a/External/Implementations/Litedb/TokenRecordDataAccess.cs
+++ b/External/Implementations/Litedb/TokenRecordDataAccess.cs
@@ -7,51 +7,40 @@ namespace CarCareTracker.External.Implementations
 {
     public class TokenRecordDataAccess : ITokenRecordDataAccess
     {
-        private static string dbName = StaticHelper.DbName;
+        private LiteDatabase db { get; set; }
         private static string tableName = "tokenrecords";
+        public TokenRecordDataAccess(ILiteDBInjection liteDB)
+        {
+            db = liteDB.GetLiteDB();
+        }
         public List<Token> GetTokens()
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<Token>(tableName);
-                return table.FindAll().ToList();
-            };
+            var table = db.GetCollection<Token>(tableName);
+            return table.FindAll().ToList();
         }
         public Token GetTokenRecordByBody(string tokenBody)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<Token>(tableName);
-                var tokenRecord = table.FindOne(Query.EQ(nameof(Token.Body), tokenBody));
-                return tokenRecord ?? new Token();
-            };
+            var table = db.GetCollection<Token>(tableName);
+            var tokenRecord = table.FindOne(Query.EQ(nameof(Token.Body), tokenBody));
+            return tokenRecord ?? new Token();
         }
         public Token GetTokenRecordByEmailAddress(string emailAddress)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<Token>(tableName);
-                var tokenRecord = table.FindOne(Query.EQ(nameof(Token.EmailAddress), emailAddress));
-                return tokenRecord ?? new Token();
-            };
+            var table = db.GetCollection<Token>(tableName);
+            var tokenRecord = table.FindOne(Query.EQ(nameof(Token.EmailAddress), emailAddress));
+            return tokenRecord ?? new Token();
         }
         public bool CreateNewToken(Token token)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<Token>(tableName);
-                table.Insert(token);
-                return true;
-            };
+            var table = db.GetCollection<Token>(tableName);
+            table.Insert(token);
+            return true;
         }
         public bool DeleteToken(int tokenId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<Token>(tableName);
-                table.Delete(tokenId);
-                return true;
-            };
+            var table = db.GetCollection<Token>(tableName);
+            table.Delete(tokenId);
+            return true;
         }
     }
 }
\ No newline at end of file
diff --git a/External/Implementations/Litedb/UpgradeRecordDataAccess.cs b/External/Implementations/Litedb/UpgradeRecordDataAccess.cs
index 4b02d3f..4e92583 100644
--- a/External/Implementations/Litedb/UpgradeRecordDataAccess.cs
+++ b/External/Implementations/Litedb/UpgradeRecordDataAccess.cs
@@ -7,51 +7,40 @@ namespace CarCareTracker.External.Implementations
 {
     public class UpgradeRecordDataAccess : IUpgradeRecordDataAccess
     {
-        private static string dbName = StaticHelper.DbName;
+        private LiteDatabase db { get; set; }
+        public UpgradeRecordDataAccess(ILiteDBInjection liteDB)
+        {
+            db = liteDB.GetLiteDB();
+        }
         private static string tableName = "upgraderecords";
         public List<UpgradeRecord> GetUpgradeRecordsByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UpgradeRecord>(tableName);
-                var upgradeRecords = table.Find(Query.EQ(nameof(UpgradeRecord.VehicleId), vehicleId));
-                return upgradeRecords.ToList() ?? new List<UpgradeRecord>();
-            };
+            var table = db.GetCollection<UpgradeRecord>(tableName);
+            var upgradeRecords = table.Find(Query.EQ(nameof(UpgradeRecord.VehicleId), vehicleId));
+            return upgradeRecords.ToList() ?? new List<UpgradeRecord>();
         }
         public UpgradeRecord GetUpgradeRecordById(int upgradeRecordId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UpgradeRecord>(tableName);
-                return table.FindById(upgradeRecordId);
-            };
+            var table = db.GetCollection<UpgradeRecord>(tableName);
+            return table.FindById(upgradeRecordId);
         }
         public bool DeleteUpgradeRecordById(int upgradeRecordId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UpgradeRecord>(tableName);
-                table.Delete(upgradeRecordId);
-                return true;
-            };
+            var table = db.GetCollection<UpgradeRecord>(tableName);
+            table.Delete(upgradeRecordId);
+            return true;
         }
         public bool SaveUpgradeRecordToVehicle(UpgradeRecord upgradeRecord)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UpgradeRecord>(tableName);
-                table.Upsert(upgradeRecord);
-                return true;
-            };
+            var table = db.GetCollection<UpgradeRecord>(tableName);
+            table.Upsert(upgradeRecord);
+            return true;
         }
         public bool DeleteAllUpgradeRecordsByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UpgradeRecord>(tableName);
-                var upgradeRecords = table.DeleteMany(Query.EQ(nameof(UpgradeRecord.VehicleId), vehicleId));
-                return true;
-            };
+            var table = db.GetCollection<UpgradeRecord>(tableName);
+            var upgradeRecords = table.DeleteMany(Query.EQ(nameof(UpgradeRecord.VehicleId), vehicleId));
+            return true;
         }
     }
 }
diff --git a/External/Implementations/Litedb/UserAccessDataAcces.cs b/External/Implementations/Litedb/UserAccessDataAcces.cs
index d8b7fea..de6b61d 100644
--- a/External/Implementations/Litedb/UserAccessDataAcces.cs
+++ b/External/Implementations/Litedb/UserAccessDataAcces.cs
@@ -1,5 +1,4 @@
 using CarCareTracker.External.Interfaces;
-using CarCareTracker.Helper;
 using CarCareTracker.Models;
 using LiteDB;
 
@@ -7,8 +6,12 @@ namespace CarCareTracker.External.Implementations
 {
     public class UserAccessDataAccess : IUserAccessDataAccess
     {
-        private static string dbName = StaticHelper.DbName;
+        private LiteDatabase db { get; set; }
         private static string tableName = "useraccessrecords";
+        public UserAccessDataAccess(ILiteDBInjection liteDB)
+        {
+            db = liteDB.GetLiteDB();
+        }
         /// <summary>
         /// Gets a list of vehicles user have access to.
         /// </summary>
@@ -16,45 +19,30 @@ namespace CarCareTracker.External.Implementations
         /// <returns></returns>
         public List<UserAccess> GetUserAccessByUserId(int userId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UserAccess>(tableName);
-                return table.Find(x=>x.Id.UserId == userId).ToList();
-            };
+            var table = db.GetCollection<UserAccess>(tableName);
+            return table.Find(x => x.Id.UserId == userId).ToList();
         }
         public UserAccess GetUserAccessByVehicleAndUserId(int userId, int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UserAccess>(tableName);
-                return table.Find(x => x.Id.UserId == userId && x.Id.VehicleId == vehicleId).FirstOrDefault();
-            };
+            var table = db.GetCollection<UserAccess>(tableName);
+            return table.Find(x => x.Id.UserId == userId && x.Id.VehicleId == vehicleId).FirstOrDefault();
         }
         public List<UserAccess> GetUserAccessByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UserAccess>(tableName);
-                return table.Find(x => x.Id.VehicleId == vehicleId).ToList();
-            };
+            var table = db.GetCollection<UserAccess>(tableName);
+            return table.Find(x => x.Id.VehicleId == vehicleId).ToList();
         }
         public bool SaveUserAccess(UserAccess userAccess)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UserAccess>(tableName);
-                table.Upsert(userAccess);
-                return true;
-            };
+            var table = db.GetCollection<UserAccess>(tableName);
+            table.Upsert(userAccess);
+            return true;
         }
         public bool DeleteUserAccess(int userId, int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UserAccess>(tableName);
-                table.DeleteMany(x => x.Id.UserId == userId && x.Id.VehicleId == vehicleId);
-                return true;
-            };
+            var table = db.GetCollection<UserAccess>(tableName);
+            table.DeleteMany(x => x.Id.UserId == userId && x.Id.VehicleId == vehicleId);
+            return true;
         }
         /// <summary>
         /// Delete all access records when a vehicle is deleted.
@@ -63,12 +51,9 @@ namespace CarCareTracker.External.Implementations
         /// <returns></returns>
         public bool DeleteAllAccessRecordsByVehicleId(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UserAccess>(tableName);
-                table.DeleteMany(x=>x.Id.VehicleId == vehicleId);
-                return true;
-            };
+            var table = db.GetCollection<UserAccess>(tableName);
+            table.DeleteMany(x => x.Id.VehicleId == vehicleId);
+            return true;
         }
         /// <summary>
         /// Delee all access records when a user is deleted.
@@ -77,12 +62,9 @@ namespace CarCareTracker.External.Implementations
         /// <returns></returns>
         public bool DeleteAllAccessRecordsByUserId(int userId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UserAccess>(tableName);
-                table.DeleteMany(x => x.Id.UserId == userId);
-                return true;
-            };
+            var table = db.GetCollection<UserAccess>(tableName);
+            table.DeleteMany(x => x.Id.UserId == userId);
+            return true;
         }
     }
 }
\ No newline at end of file
diff --git a/External/Implementations/Litedb/UserConfigDataAccess.cs b/External/Implementations/Litedb/UserConfigDataAccess.cs
index ec3d9d5..458f237 100644
--- a/External/Implementations/Litedb/UserConfigDataAccess.cs
+++ b/External/Implementations/Litedb/UserConfigDataAccess.cs
@@ -1,39 +1,33 @@
 using CarCareTracker.External.Interfaces;
-using CarCareTracker.Helper;
 using CarCareTracker.Models;
 using LiteDB;
 
 namespace CarCareTracker.External.Implementations
 {
-    public class UserConfigDataAccess: IUserConfigDataAccess
+    public class UserConfigDataAccess : IUserConfigDataAccess
     {
-        private static string dbName = StaticHelper.DbName;
+        private LiteDatabase db { get; set; }
         private static string tableName = "userconfigrecords";
+        public UserConfigDataAccess(ILiteDBInjection liteDB)
+        {
+            db = liteDB.GetLiteDB();
+        }
         public UserConfigData GetUserConfig(int userId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UserConfigData>(tableName);
-                return table.FindById(userId);
-            };
+            var table = db.GetCollection<UserConfigData>(tableName);
+            return table.FindById(userId);
         }
         public bool SaveUserConfig(UserConfigData userConfigData)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UserConfigData>(tableName);
-                table.Upsert(userConfigData);
-                return true;
-            };
+            var table = db.GetCollection<UserConfigData>(tableName);
+            table.Upsert(userConfigData);
+            return true;
         }
         public bool DeleteUserConfig(int userId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UserConfigData>(tableName);
-                table.Delete(userId);
-                return true;
-            };
+            var table = db.GetCollection<UserConfigData>(tableName);
+            table.Delete(userId);
+            return true;
         }
     }
 }
diff --git a/External/Implementations/Litedb/UserRecordDataAccess.cs b/External/Implementations/Litedb/UserRecordDataAccess.cs
index 7e13f46..f9bb016 100644
--- a/External/Implementations/Litedb/UserRecordDataAccess.cs
+++ b/External/Implementations/Litedb/UserRecordDataAccess.cs
@@ -1,5 +1,4 @@
 using CarCareTracker.External.Interfaces;
-using CarCareTracker.Helper;
 using CarCareTracker.Models;
 using LiteDB;
 
@@ -7,60 +6,46 @@ namespace CarCareTracker.External.Implementations
 {
     public class UserRecordDataAccess : IUserRecordDataAccess
     {
-        private static string dbName = StaticHelper.DbName;
+        private LiteDatabase db { get; set; }
         private static string tableName = "userrecords";
+        public UserRecordDataAccess(ILiteDBInjection liteDB)
+        {
+            db = liteDB.GetLiteDB();
+        }
         public List<UserData> GetUsers()
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UserData>(tableName);
-                return table.FindAll().ToList();
-            };
+            var table = db.GetCollection<UserData>(tableName);
+            return table.FindAll().ToList();
         }
         public UserData GetUserRecordByUserName(string userName)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UserData>(tableName);
-                var userRecord = table.FindOne(Query.EQ(nameof(UserData.UserName), userName));
-                return userRecord ?? new UserData();
-            };
+            var table = db.GetCollection<UserData>(tableName);
+            var userRecord = table.FindOne(Query.EQ(nameof(UserData.UserName), userName));
+            return userRecord ?? new UserData();
         }
         public UserData GetUserRecordByEmailAddress(string emailAddress)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UserData>(tableName);
-                var userRecord = table.FindOne(Query.EQ(nameof(UserData.EmailAddress), emailAddress));
-                return userRecord ?? new UserData();
-            };
+            var table = db.GetCollection<UserData>(tableName);
+            var userRecord = table.FindOne(Query.EQ(nameof(UserData.EmailAddress), emailAddress));
+            return userRecord ?? new UserData();
         }
         public UserData GetUserRecordById(int userId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UserData>(tableName);
-                var userRecord = table.FindById(userId);
-                return userRecord ?? new UserData();
-            };
+            var table = db.GetCollection<UserData>(tableName);
+            var userRecord = table.FindById(userId);
+            return userRecord ?? new UserData();
         }
         public bool SaveUserRecord(UserData userRecord)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UserData>(tableName);
-                table.Upsert(userRecord);
-                return true;
-            };
+            var table = db.GetCollection<UserData>(tableName);
+            table.Upsert(userRecord);
+            return true;
         }
         public bool DeleteUserRecord(int userId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<UserData>(tableName);
-                table.Delete(userId);
-                return true;
-            };
+            var table = db.GetCollection<UserData>(tableName);
+            table.Delete(userId);
+            return true;
         }
     }
 }
\ No newline at end of file
diff --git a/External/Implementations/Litedb/VehicleDataAccess.cs b/External/Implementations/Litedb/VehicleDataAccess.cs
index db8afab..da49458 100644
--- a/External/Implementations/Litedb/VehicleDataAccess.cs
+++ b/External/Implementations/Litedb/VehicleDataAccess.cs
@@ -1,46 +1,37 @@
 using CarCareTracker.External.Interfaces;
-using CarCareTracker.Helper;
 using CarCareTracker.Models;
 using LiteDB;
 
 namespace CarCareTracker.External.Implementations
 {
-    public class VehicleDataAccess: IVehicleDataAccess
+    public class VehicleDataAccess : IVehicleDataAccess
     {
-        private static string dbName = StaticHelper.DbName;
+        private LiteDatabase db { get; set; }
         private static string tableName = "vehicles";
+        public VehicleDataAccess(ILiteDBInjection liteDB)
+        {
+            db = liteDB.GetLiteDB();
+        }
         public bool SaveVehicle(Vehicle vehicle)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<Vehicle>(tableName);
-                var result = table.Upsert(vehicle);
-                return true;
-            };
+            var table = db.GetCollection<Vehicle>(tableName);
+            var result = table.Upsert(vehicle);
+            return true;
         }
         public bool DeleteVehicle(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<Vehicle>(tableName);
-                return table.Delete(vehicleId);
-            };
+            var table = db.GetCollection<Vehicle>(tableName);
+            return table.Delete(vehicleId);
         }
         public List<Vehicle> GetVehicles()
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<Vehicle>(tableName);
-                return table.FindAll().ToList();
-            };
+            var table = db.GetCollection<Vehicle>(tableName);
+            return table.FindAll().ToList();
         }
         public Vehicle GetVehicleById(int vehicleId)
         {
-            using (var db = new LiteDatabase(dbName))
-            {
-                var table = db.GetCollection<Vehicle>(tableName);
-                return table.FindById(vehicleId);
-            };
+            var table = db.GetCollection<Vehicle>(tableName);
+            return table.FindById(vehicleId);
         }
     }
 }
diff --git a/Program.cs b/Program.cs
index f7bed71..1abbb8e 100644
--- a/Program.cs
+++ b/Program.cs
@@ -38,6 +38,7 @@ if (!string.IsNullOrWhiteSpace(builder.Configuration["POSTGRES_CONNECTION"])){
 }
 else
 {
+    builder.Services.AddSingleton<ILiteDBInjection, LiteDBInjection>();
     builder.Services.AddSingleton<IVehicleDataAccess, VehicleDataAccess>();
     builder.Services.AddSingleton<INoteDataAccess, NoteDataAccess>();
     builder.Services.AddSingleton<IServiceRecordDataAccess, ServiceRecordDataAccess>();