diff --git a/Back/skydiveLogs-api.Business/JumpService.cs b/Back/skydiveLogs-api.Business/JumpService.cs
index 91322f2..01d8b82 100644
--- a/Back/skydiveLogs-api.Business/JumpService.cs
+++ b/Back/skydiveLogs-api.Business/JumpService.cs
@@ -39,7 +39,7 @@ namespace skydiveLogs_api.Business
             jump.JumpType = selectedJumpType;
             jump.DropZone = selectedDropZone;
             jump.Gear = selectedGear;
-            jump.UserId = connectedUser.Id;
+            jump.User = connectedUser;
 
             _jumpRepository.Add(jump);
         }
@@ -51,7 +51,7 @@ namespace skydiveLogs_api.Business
 
         public IEnumerable<Jump> GetAllJumps(User connectedUser)
         {
-            return _jumpRepository.GetAll(connectedUser.Id);
+            return _jumpRepository.GetAll(connectedUser);
         }
 
         public Jump GetJumpById(int id)
diff --git a/Back/skydiveLogs-api.Data/ImageRepository.cs b/Back/skydiveLogs-api.Data/ImageRepository.cs
index 903afd9..3c6fcee 100644
--- a/Back/skydiveLogs-api.Data/ImageRepository.cs
+++ b/Back/skydiveLogs-api.Data/ImageRepository.cs
@@ -19,7 +19,15 @@ namespace skydiveLogs_api.Data
 
         public IEnumerable<Image> GetAll()
         {
-            return _col.FindAll().ToList();
+            throw new System.NotImplementedException();
+        }
+
+        public IEnumerable<Image> GetAll(User user)
+        {
+            return _col.Include(x => x.User)
+                       .Query()
+                       .Where(j => j.User == user)
+                       .ToList();
         }
 
         public Image GetById(int id)
diff --git a/Back/skydiveLogs-api.Data/Interface/IImageRepository.cs b/Back/skydiveLogs-api.Data/Interface/IImageRepository.cs
index 141bc2f..b0d275c 100644
--- a/Back/skydiveLogs-api.Data/Interface/IImageRepository.cs
+++ b/Back/skydiveLogs-api.Data/Interface/IImageRepository.cs
@@ -1,9 +1,11 @@
-using skydiveLogs_api.Model;
+using System.Collections.Generic;
+using skydiveLogs_api.Model;
 
 
 namespace skydiveLogs_api.Data.Interface
 {
     public interface IImageRepository : IRepository<Image>
     {
+        IEnumerable<Image> GetAll(User user);
     }
 }
diff --git a/Back/skydiveLogs-api.Data/Interface/IJumpRepository.cs b/Back/skydiveLogs-api.Data/Interface/IJumpRepository.cs
index 8ed49ab..e3ecd8e 100644
--- a/Back/skydiveLogs-api.Data/Interface/IJumpRepository.cs
+++ b/Back/skydiveLogs-api.Data/Interface/IJumpRepository.cs
@@ -5,7 +5,7 @@ namespace skydiveLogs_api.Data.Interface
 {
     public interface IJumpRepository : IRepository<Jump>
     {
-        IEnumerable<Jump> GetAll(int userId);
+        IEnumerable<Jump> GetAll(User user);
 
     }
 }
diff --git a/Back/skydiveLogs-api.Data/JumpRepository.cs b/Back/skydiveLogs-api.Data/JumpRepository.cs
index c0c4447..1ae7c6e 100644
--- a/Back/skydiveLogs-api.Data/JumpRepository.cs
+++ b/Back/skydiveLogs-api.Data/JumpRepository.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
 
 using LiteDB;
 
@@ -17,14 +16,15 @@ namespace skydiveLogs_api.Data
             _col = _dataProvider.CollOfJump;
         }
 
-        public IEnumerable<Jump> GetAll(int userId)
+        public IEnumerable<Jump> GetAll(User user)
         {
             return _col.Include(x => x.Aircraft)
                        .Include(x => x.DropZone)
                        .Include(x => x.Gear)
                        .Include(x => x.JumpType)
-                       .FindAll()
-                       .Where(j => j.UserId == userId)
+                       .Include(x => x.User)
+                       .Query()
+                       .Where(j => j.User == user)
                        .ToList();
         }
 
diff --git a/Back/skydiveLogs-api.Data/LiteDbProvider.cs b/Back/skydiveLogs-api.Data/LiteDbProvider.cs
index 7ad3405..fd8d29b 100644
--- a/Back/skydiveLogs-api.Data/LiteDbProvider.cs
+++ b/Back/skydiveLogs-api.Data/LiteDbProvider.cs
@@ -14,6 +14,7 @@ namespace skydiveLogs_api.Data
             BsonMapper.Global.Entity<Jump>().DbRef(x => x.Aircraft, "Aircraft");
             BsonMapper.Global.Entity<Jump>().DbRef(x => x.DropZone, "DropZone");
             BsonMapper.Global.Entity<Jump>().DbRef(x => x.Gear, "Gear");
+            BsonMapper.Global.Entity<Jump>().DbRef(x => x.User, "User");
 
             BsonMapper.Global.Entity<Image>().DbRef(x => x.User, "User");
         }
diff --git a/Back/skydiveLogs-api.Model/Aircraft.cs b/Back/skydiveLogs-api.Model/Aircraft.cs
index a1d8703..57760da 100644
--- a/Back/skydiveLogs-api.Model/Aircraft.cs
+++ b/Back/skydiveLogs-api.Model/Aircraft.cs
@@ -5,5 +5,7 @@
         public int Id { get; set; }
 
         public string Name { get; set; }
+
+        public string ImageData { get; set; }
     }
 }
diff --git a/Back/skydiveLogs-api.Model/Jump.cs b/Back/skydiveLogs-api.Model/Jump.cs
index 7641314..244fc27 100644
--- a/Back/skydiveLogs-api.Model/Jump.cs
+++ b/Back/skydiveLogs-api.Model/Jump.cs
@@ -14,7 +14,7 @@ namespace skydiveLogs_api.Model
 
         public Gear Gear { get; set; }
 
-        public int UserId { get; set; }
+        public User User { get; set; }
 
         public int ExitAltitude { get; set; }
 
diff --git a/Back/skydiveLogs-api/Data/JumpsDb-log.db b/Back/skydiveLogs-api/Data/JumpsDb-log.db
deleted file mode 100644
index e135b20..0000000
Binary files a/Back/skydiveLogs-api/Data/JumpsDb-log.db and /dev/null differ
diff --git a/Back/skydiveLogs-api/Data/JumpsDb.db b/Back/skydiveLogs-api/Data/JumpsDb.db
index 60e9773..c0e6daa 100644
Binary files a/Back/skydiveLogs-api/Data/JumpsDb.db and b/Back/skydiveLogs-api/Data/JumpsDb.db differ
diff --git a/Back/skydiveLogs-api/DataContract/AircraftReq.cs b/Back/skydiveLogs-api/DataContract/AircraftReq.cs
index 118c467..cd68eed 100644
--- a/Back/skydiveLogs-api/DataContract/AircraftReq.cs
+++ b/Back/skydiveLogs-api/DataContract/AircraftReq.cs
@@ -5,5 +5,7 @@
         public int Id { get; set; }
 
         public string Name { get; set; }
+
+        public string ImageData { get; set; }
     }
 }
diff --git a/Back/skydiveLogs-api/DataContract/AircraftResp.cs b/Back/skydiveLogs-api/DataContract/AircraftResp.cs
index b5c6261..b4b135e 100644
--- a/Back/skydiveLogs-api/DataContract/AircraftResp.cs
+++ b/Back/skydiveLogs-api/DataContract/AircraftResp.cs
@@ -5,5 +5,7 @@
         public int Id { get; set; }
 
         public string Name { get; set; }
+
+        public string ImageData { get; set; }
     }
 }