diff --git a/src/Services/e-sender/O2NextGen.ESender.Api/Controllers/BoardController.cs b/src/Services/e-sender/O2NextGen.ESender.Api/Controllers/BoardController.cs
index c7ac334a..07f2cb37 100644
--- a/src/Services/e-sender/O2NextGen.ESender.Api/Controllers/BoardController.cs
+++ b/src/Services/e-sender/O2NextGen.ESender.Api/Controllers/BoardController.cs
@@ -43,7 +43,7 @@ public async Task<IActionResult> Detail(long id)
         [HttpPost]
         [Route("id")]
         [ValidateAntiForgeryToken]
-        public async Task<IActionResult> Edit(long id, MailRequestViewModel model)
+        public async Task<IActionResult> Edit(long id, EmailRequestViewModel model)
         {
             var certificate = await _emailSenderService.GetByIdAsync(id, CancellationToken.None);
             if (certificate == null)
@@ -65,7 +65,7 @@ public IActionResult Create()
 
         [HttpPost]
         [Route("")]
-        public async Task<IActionResult> CreateReally(MailRequestViewModel model)
+        public async Task<IActionResult> CreateReally(EmailRequestViewModel model)
         {
             var emailRequest = await _emailSenderService.AddAsync(model.ToModel(), CancellationToken.None);
             await _emailSender.Send(model.To, model.Subject, model.Body);
diff --git a/src/Services/e-sender/O2NextGen.ESender.Api/Controllers/EmailSenderController.cs b/src/Services/e-sender/O2NextGen.ESender.Api/Controllers/EmailSenderController.cs
index fb7109b1..af4be29f 100644
--- a/src/Services/e-sender/O2NextGen.ESender.Api/Controllers/EmailSenderController.cs
+++ b/src/Services/e-sender/O2NextGen.ESender.Api/Controllers/EmailSenderController.cs
@@ -50,7 +50,7 @@ public async Task<IActionResult> GetByIdAsync(long id, CancellationToken ct)
 
         [HttpPut]
         [Route("id")]
-        public async Task<IActionResult> UpdateAsync(long id, [FromBody]MailRequestViewModel model, CancellationToken ct)
+        public async Task<IActionResult> UpdateAsync(long id, [FromBody]EmailRequestViewModel model, CancellationToken ct)
         {
             var certificate = await _emailSenderService.UpdateAsync(model.ToModel(), ct);
             return Ok(certificate.ToViewModel());
@@ -59,7 +59,7 @@ public async Task<IActionResult> UpdateAsync(long id, [FromBody]MailRequestViewM
         [HttpPost]
         [HttpPut]
         [Route("")]
-        public async Task<IActionResult> AddAsync([FromBody]MailRequestViewModel model, CancellationToken ct)
+        public async Task<IActionResult> AddAsync([FromBody]EmailRequestViewModel model, CancellationToken ct)
         {
             var emailRequest = await _emailSenderService.AddAsync(model.ToModel(), ct);
             await _emailSender.Send(model.To, model.Subject, model.Body);
diff --git a/src/Services/e-sender/O2NextGen.ESender.Api/Extensions/KeyGenerator.cs b/src/Services/e-sender/O2NextGen.ESender.Api/Extensions/KeyGenerator.cs
new file mode 100644
index 00000000..865b3241
--- /dev/null
+++ b/src/Services/e-sender/O2NextGen.ESender.Api/Extensions/KeyGenerator.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+
+namespace O2NextGen.ESender.Api.Extensions
+{
+    public static class KeyGenerator
+    {
+        // private const string ValidChars = "abcdefghjkmnprstwxz2345789"; // Letters and numbers that are not easily mixed with others when reading
+        private const string ValidChars = "ABCDEFHJKLMNPRSTUWXYZ012345789";
+        private static readonly Dictionary<long, bool> ValidCharLookup = new Dictionary<long, bool>();
+        private static readonly Random Rnd = new Random();
+
+        static KeyGenerator()
+        {
+            // Set up a quick lookup dictionary for all valid characters
+            foreach (var c in ValidChars.ToUpperInvariant())
+                ValidCharLookup.Add(c, true);
+        }
+
+        public static string Generate(int length)
+        {
+            var ret = new char[length];
+            for (var i = 0; i < length; i++)
+            {
+                int c;
+                lock (Rnd)
+                {
+                    c = Rnd.Next(0, ValidChars.Length);
+                }
+
+                ret[i] = ValidChars[c];
+            }
+
+            return new string(ret);
+        }
+
+        public static bool Validate(int maxLength, string key)
+        {
+            if (key.Length > maxLength)
+                return false;
+
+            foreach (var c in key.ToUpperInvariant())
+                if (!ValidCharLookup.ContainsKey(c))
+                    return false;
+            return true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Services/e-sender/O2NextGen.ESender.Api/Extensions/UnixDateExtensions.cs b/src/Services/e-sender/O2NextGen.ESender.Api/Extensions/UnixDateExtensions.cs
new file mode 100644
index 00000000..d88f3a27
--- /dev/null
+++ b/src/Services/e-sender/O2NextGen.ESender.Api/Extensions/UnixDateExtensions.cs
@@ -0,0 +1,20 @@
+using System;
+
+namespace O2NextGen.ESender.Api.Extensions
+{
+    public static class UnixDateExtensions
+    {
+        private static readonly DateTime UnixEpoch =
+            new DateTime(1970, 1, 1, 0, 0, 0, 0).ToLocalTime();
+
+        public static DateTime ConvertToDateTime(this long seconds, bool isSeconds = true)
+        {
+            return isSeconds ? UnixEpoch.AddSeconds(seconds) : UnixEpoch.AddMinutes(seconds);
+        }
+
+        public static long ConvertToUnixTime(this DateTime datetime, bool isSeconds = true)
+        {
+            return isSeconds ? (long)(datetime - UnixEpoch).TotalSeconds : (long)(datetime - UnixEpoch).TotalMinutes;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Services/e-sender/O2NextGen.ESender.Api/Mappings/BaseMappings.cs b/src/Services/e-sender/O2NextGen.ESender.Api/Mappings/BaseMappings.cs
new file mode 100644
index 00000000..83a77898
--- /dev/null
+++ b/src/Services/e-sender/O2NextGen.ESender.Api/Mappings/BaseMappings.cs
@@ -0,0 +1,67 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using O2NextGen.ESender.Api.Extensions;
+using O2NextGen.ESender.Api.Models;
+using O2NextGen.ESender.Business.Models;
+
+namespace O2NextGen.ESender.Api.Mappings
+{
+    public class BaseMappings<TViewModel, TModel>
+        where TViewModel : class, IViewModel
+        where TModel : class, IBaseModel
+    {
+        public TViewModel ToViewModel(TModel model)
+        {
+            if (model == null)
+                return null;
+
+            var returnViewModel = Activator.CreateInstance<TViewModel>();
+
+            returnViewModel.Id = model.Id;
+            returnViewModel.ExternalId = model.ExternalId;
+            returnViewModel.AddedDate = model.AddedDate;
+            returnViewModel.ModifiedDate = model.ModifiedDate;
+            returnViewModel.DeletedDate = model.DeletedDate;
+            returnViewModel.IsDeleted = model.IsDeleted;
+
+            return returnViewModel;
+        }
+
+        public TModel ToServiceModel(TViewModel viewModel)
+        {
+            //Todo: return not null
+            if (viewModel == null)
+                return null;
+
+            var model = Activator.CreateInstance<TModel>();
+
+            model.Id = viewModel.Id;
+            model.ExternalId = viewModel.ExternalId;
+            model.AddedDate = viewModel.AddedDate ?? default(long);
+            model.ModifiedDate = viewModel.ModifiedDate ?? default(long);
+            model.DeletedDate = viewModel.DeletedDate ?? DateTime.Now.ConvertToUnixTime();
+            model.IsDeleted = viewModel.IsDeleted ?? default(bool);
+
+            return model;
+        }
+
+        public IReadOnlyCollection<TViewModel> ToViewModel(IReadOnlyCollection<TModel> models)
+        {
+            if (models.Count == 0)
+            {
+                return Array.Empty<TViewModel>();
+            }
+
+            var subscription = new TViewModel[models.Count];
+            var i = 0;
+            foreach (var model in models)
+            {
+                subscription[i] = ToViewModel(model);
+                ++i;
+            }
+
+            return new ReadOnlyCollection<TViewModel>(subscription);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Services/e-sender/O2NextGen.ESender.Api/Mappings/EmailRequestMappings.cs b/src/Services/e-sender/O2NextGen.ESender.Api/Mappings/EmailRequestMappings.cs
index e2b0e6b8..c7871f8e 100644
--- a/src/Services/e-sender/O2NextGen.ESender.Api/Mappings/EmailRequestMappings.cs
+++ b/src/Services/e-sender/O2NextGen.ESender.Api/Mappings/EmailRequestMappings.cs
@@ -8,15 +8,23 @@ namespace O2NextGen.ESender.Api.Mappings
 {
     public static class EmailRequestMappings
     {
-        public static MailRequestViewModel ToViewModel(this EmailRequest model)
+        private static readonly
+            BaseMappings<EmailRequestViewModel, EmailRequestModel> BaseMappings;
+        
+        static EmailRequestMappings()
+        {
+            BaseMappings =
+                new BaseMappings<EmailRequestViewModel, EmailRequestModel>();
+        }
+        
+        public static EmailRequestViewModel ToViewModel(this EmailRequestModel model)
         {
             if (model == null)
                 return null;
 
-            var viewModel = new MailRequestViewModel();
+            var viewModel = BaseMappings.ToViewModel(model);
 
             //Bindings
-            viewModel.Id = model.Id;
             viewModel.From = model.From;
             viewModel.To = model.To;
             viewModel.Subject = model.Subject;
@@ -25,32 +33,31 @@ public static MailRequestViewModel ToViewModel(this EmailRequest model)
             return viewModel;
         }
 
-        public static EmailRequest ToModel(this MailRequestViewModel requestViewModel)
+        public static EmailRequestModel ToModel(this EmailRequestViewModel viewModel)
         {
-            if (requestViewModel == null)
+            if (viewModel == null)
                 return null;
 
-            var model = new EmailRequest();
+            var model = BaseMappings.ToServiceModel(viewModel);
 
             //Bindings
-            model.Id = requestViewModel.Id;
-            model.From = requestViewModel.From;
-            model.To = requestViewModel.To;
-            model.Subject = requestViewModel.Subject;
-            model.Body = requestViewModel.Body;
+            model.From = viewModel.From;
+            model.To = viewModel.To;
+            model.Subject = viewModel.Subject;
+            model.Body = viewModel.Body;
 
             return model;
         }
 
-        public static IReadOnlyCollection<MailRequestViewModel> ToViewModel(
-            this IReadOnlyCollection<EmailRequest> models)
+        public static IReadOnlyCollection<EmailRequestViewModel> ToViewModel(
+            this IReadOnlyCollection<EmailRequestModel> models)
         {
             if (models.Count == 0)
             {
-                return Array.Empty<MailRequestViewModel>();
+                return Array.Empty<EmailRequestViewModel>();
             }
 
-            var subscription = new MailRequestViewModel[models.Count];
+            var subscription = new EmailRequestViewModel[models.Count];
             var i = 0;
             foreach (var model in models)
             {
@@ -58,7 +65,23 @@ public static IReadOnlyCollection<MailRequestViewModel> ToViewModel(
                 ++i;
             }
 
-            return new ReadOnlyCollection<MailRequestViewModel>(subscription);
+            return new ReadOnlyCollection<EmailRequestViewModel>(subscription);
+        }
+        
+        public static IReadOnlyCollection<EmailRequestModel> ToModel(
+            this IReadOnlyCollection<EmailRequestViewModel> models)
+        {
+            if (models.Count == 0) return Array.Empty<EmailRequestModel>();
+
+            var subscription = new EmailRequestModel[models.Count];
+            var i = 0;
+            foreach (var model in models)
+            {
+                subscription[i] = ToModel(model);
+                ++i;
+            }
+
+            return new ReadOnlyCollection<EmailRequestModel>(subscription);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Services/e-sender/O2NextGen.ESender.Api/Models/EmailRequestViewModel.cs b/src/Services/e-sender/O2NextGen.ESender.Api/Models/EmailRequestViewModel.cs
new file mode 100644
index 00000000..79cb5e9e
--- /dev/null
+++ b/src/Services/e-sender/O2NextGen.ESender.Api/Models/EmailRequestViewModel.cs
@@ -0,0 +1,27 @@
+using System;
+namespace O2NextGen.ESender.Api.Models
+{
+    public interface IViewModel
+    {
+        long Id { get; set; }
+        string ExternalId { get; set; }
+        long? ModifiedDate { get; set; }
+        long? AddedDate { get; set; }
+        long? DeletedDate { get; set; }
+        bool? IsDeleted { get; set; }
+    }
+    public class EmailRequestViewModel: IViewModel
+    {
+        public long Id { get;  set; }
+        public string ExternalId { get; set; }
+        public long? ModifiedDate { get; set; }
+        public long? AddedDate { get; set; }
+        public long? DeletedDate { get; set; }
+        public bool? IsDeleted { get; set; }
+        public string From { get;  set; }
+        public string To { get;  set; }
+        public string Body { get;  set; }
+        public string Subject { get;  set; }
+    }
+}
+
diff --git a/src/Services/e-sender/O2NextGen.ESender.Api/Models/MailRequestViewModel.cs b/src/Services/e-sender/O2NextGen.ESender.Api/Models/MailRequestViewModel.cs
deleted file mode 100644
index 23b38665..00000000
--- a/src/Services/e-sender/O2NextGen.ESender.Api/Models/MailRequestViewModel.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-namespace O2NextGen.ESender.Api.Models
-{
-    public class MailRequestViewModel
-    {
-        public long Id { get;  set; }
-        public string From { get;  set; }
-        public string To { get;  set; }
-        public string Body { get;  set; }
-        public string Subject { get;  set; }
-    }
-}
-
diff --git a/src/Services/e-sender/O2NextGen.ESender.Api/Views/Board/Create.cshtml b/src/Services/e-sender/O2NextGen.ESender.Api/Views/Board/Create.cshtml
index ae9c83ec..01a33fac 100644
--- a/src/Services/e-sender/O2NextGen.ESender.Api/Views/Board/Create.cshtml
+++ b/src/Services/e-sender/O2NextGen.ESender.Api/Views/Board/Create.cshtml
@@ -1,4 +1,4 @@
-@model MailRequestViewModel
+@model EmailRequestViewModel
 
 <form asp-controller="Board" asp-action="CreateReally" method="post">
     <label asp-for="From">From</label>
diff --git a/src/Services/e-sender/O2NextGen.ESender.Api/Views/Board/Detail.cshtml b/src/Services/e-sender/O2NextGen.ESender.Api/Views/Board/Detail.cshtml
index d4e189e3..fed1dda1 100644
--- a/src/Services/e-sender/O2NextGen.ESender.Api/Views/Board/Detail.cshtml
+++ b/src/Services/e-sender/O2NextGen.ESender.Api/Views/Board/Detail.cshtml
@@ -1,5 +1,5 @@
 
-@model MailRequestViewModel
+@model EmailRequestViewModel
 
 <form asp-controller="Board" asp-action="Edit" asp-route-id="@Model.Id">
     <label asp-for="From">From</label>
diff --git a/src/Services/e-sender/O2NextGen.ESender.Api/Views/Board/Index.cshtml b/src/Services/e-sender/O2NextGen.ESender.Api/Views/Board/Index.cshtml
index f5349c98..a8621047 100644
--- a/src/Services/e-sender/O2NextGen.ESender.Api/Views/Board/Index.cshtml
+++ b/src/Services/e-sender/O2NextGen.ESender.Api/Views/Board/Index.cshtml
@@ -1,4 +1,4 @@
-@model IEnumerable<MailRequestViewModel>
+@model IEnumerable<EmailRequestViewModel>
 <h1> E-Sender Service</h1>
 <h2>Administration board v1.0.0.0</h2>
 <style>
diff --git a/src/Services/e-sender/O2NextGen.ESender.Business/Models/EmailRequest.cs b/src/Services/e-sender/O2NextGen.ESender.Business/Models/EmailRequest.cs
deleted file mode 100644
index f1f6dab4..00000000
--- a/src/Services/e-sender/O2NextGen.ESender.Business/Models/EmailRequest.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace O2NextGen.ESender.Business.Models
-{
-    public class EmailRequest
-    {
-        public long Id { get; set; }
-        public string From { get; set; }
-        public string To { get; set; }
-        public string Subject { get; set; }
-        public string Body { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/Services/e-sender/O2NextGen.ESender.Business/Models/EmailRequestModel.cs b/src/Services/e-sender/O2NextGen.ESender.Business/Models/EmailRequestModel.cs
new file mode 100644
index 00000000..6bee26d7
--- /dev/null
+++ b/src/Services/e-sender/O2NextGen.ESender.Business/Models/EmailRequestModel.cs
@@ -0,0 +1,16 @@
+namespace O2NextGen.ESender.Business.Models
+{
+    public class EmailRequestModel: IBaseModel
+    {
+        public long Id { get; set; }
+        public string ExternalId { get; set; }
+        public string From { get; set; }
+        public string To { get; set; }
+        public string Subject { get; set; }
+        public string Body { get; set; }
+        public long AddedDate { get; set; }
+        public long DeletedDate { get; set; }
+        public bool IsDeleted { get; set; }
+        public long ModifiedDate { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Services/e-sender/O2NextGen.ESender.Business/Models/IBaseModel.cs b/src/Services/e-sender/O2NextGen.ESender.Business/Models/IBaseModel.cs
new file mode 100644
index 00000000..202dc178
--- /dev/null
+++ b/src/Services/e-sender/O2NextGen.ESender.Business/Models/IBaseModel.cs
@@ -0,0 +1,12 @@
+namespace O2NextGen.ESender.Business.Models
+{
+    public interface IBaseModel
+    {
+        long Id { get;  set; }
+        string ExternalId { get; set; }
+        long ModifiedDate { get; set; }
+        long AddedDate { get; set; }
+        long DeletedDate { get; set; }
+        bool IsDeleted { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Services/e-sender/O2NextGen.ESender.Business/Services/IEmailSenderService.cs b/src/Services/e-sender/O2NextGen.ESender.Business/Services/IEmailSenderService.cs
index 6b98147e..7e82b4eb 100644
--- a/src/Services/e-sender/O2NextGen.ESender.Business/Services/IEmailSenderService.cs
+++ b/src/Services/e-sender/O2NextGen.ESender.Business/Services/IEmailSenderService.cs
@@ -7,13 +7,13 @@ namespace O2NextGen.ESender.Business.Services
 {
     public interface IEmailSenderService
     {
-        Task<IReadOnlyCollection<EmailRequest>> GetAllAsync(CancellationToken ct);
+        Task<IReadOnlyCollection<EmailRequestModel>> GetAllAsync(CancellationToken ct);
 
-        Task<EmailRequest> GetByIdAsync(long id, CancellationToken ct);
+        Task<EmailRequestModel> GetByIdAsync(long id, CancellationToken ct);
 
-        Task<EmailRequest> UpdateAsync(EmailRequest emailRequest, CancellationToken ct);
+        Task<EmailRequestModel> UpdateAsync(EmailRequestModel emailRequestModel, CancellationToken ct);
 
-        Task<EmailRequest> AddAsync(EmailRequest emailRequest, CancellationToken ct);
+        Task<EmailRequestModel> AddAsync(EmailRequestModel emailRequestModel, CancellationToken ct);
         
         Task RemoveAsync(long id, CancellationToken ct);
     }
diff --git a/src/Services/e-sender/O2NextGen.ESender.Data/ESenderDbContext.cs b/src/Services/e-sender/O2NextGen.ESender.Data/ESenderDbContext.cs
index 7c8260a6..7fbe1089 100644
--- a/src/Services/e-sender/O2NextGen.ESender.Data/ESenderDbContext.cs
+++ b/src/Services/e-sender/O2NextGen.ESender.Data/ESenderDbContext.cs
@@ -8,7 +8,7 @@ public class ESenderDbContext: DbContext
     {
         #region Fields
 
-        public DbSet<MailRequestEntity> MailRequests { get; set; }
+        public DbSet<EmailRequestDbEntity> MailRequests { get; set; }
 
         #endregion
         
@@ -25,10 +25,10 @@ public ESenderDbContext(DbContextOptions<ESenderDbContext> options)
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
-            modelBuilder.Entity<MailRequestEntity>(ConfigureMailRequestEntity);
+            modelBuilder.Entity<EmailRequestDbEntity>(ConfigureMailRequestEntity);
         }
 
-        private void ConfigureMailRequestEntity(EntityTypeBuilder<MailRequestEntity> builder)
+        private void ConfigureMailRequestEntity(EntityTypeBuilder<EmailRequestDbEntity> builder)
         {
             builder.ToTable("MailRequest");
 
diff --git a/src/Services/e-sender/O2NextGen.ESender.Data/Entities/MailRequestEntity.cs b/src/Services/e-sender/O2NextGen.ESender.Data/Entities/EmailRequestDbEntity.cs
similarity index 52%
rename from src/Services/e-sender/O2NextGen.ESender.Data/Entities/MailRequestEntity.cs
rename to src/Services/e-sender/O2NextGen.ESender.Data/Entities/EmailRequestDbEntity.cs
index cc0b474e..f698a9db 100644
--- a/src/Services/e-sender/O2NextGen.ESender.Data/Entities/MailRequestEntity.cs
+++ b/src/Services/e-sender/O2NextGen.ESender.Data/Entities/EmailRequestDbEntity.cs
@@ -1,11 +1,15 @@
 namespace O2NextGen.ESender.Data.Entities
 {
-    public class MailRequestEntity
+    public class EmailRequestDbEntity: IDbEntity
     {
         public long Id { get; set; }
         public string From { get; set; }
         public string To { get; set; }
         public string Subject { get; set; }
         public string Body { get; set; }
+        public long ModifiedDate { get; set; }
+        public long DeletedDate { get; set; }
+        public bool IsDeleted { get; set; }
+        public long AddedDate { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Services/e-sender/O2NextGen.ESender.Data/Entities/IDbEntity.cs b/src/Services/e-sender/O2NextGen.ESender.Data/Entities/IDbEntity.cs
new file mode 100644
index 00000000..8751f656
--- /dev/null
+++ b/src/Services/e-sender/O2NextGen.ESender.Data/Entities/IDbEntity.cs
@@ -0,0 +1,11 @@
+namespace O2NextGen.ESender.Data.Entities
+{
+    public interface IDbEntity
+    {
+        long Id { get; set; }
+        long AddedDate { get; set; }
+        long ModifiedDate { get; set; }
+        long DeletedDate { get; set; }
+        bool IsDeleted { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Services/e-sender/O2NextGen.ESender.Impl/Mappings/BaseMappings.cs b/src/Services/e-sender/O2NextGen.ESender.Impl/Mappings/BaseMappings.cs
new file mode 100644
index 00000000..d890f9f8
--- /dev/null
+++ b/src/Services/e-sender/O2NextGen.ESender.Impl/Mappings/BaseMappings.cs
@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using O2NextGen.ESender.Business.Models;
+using O2NextGen.ESender.Data.Entities;
+
+namespace O2NextGen.ESender.Impl.Mappings
+{
+    public class BaseMappings<TViewModel, TModel>
+        where TViewModel : class, IDbEntity
+        where TModel : class, IBaseModel
+    {
+        public TViewModel ToViewModel(TModel model)
+        {
+            if (model == null)
+                return null;
+
+            var returnViewModel = Activator.CreateInstance<TViewModel>();
+
+            returnViewModel.Id = model.Id;
+            returnViewModel.AddedDate = model.AddedDate;
+            returnViewModel.ModifiedDate = model.ModifiedDate;
+            returnViewModel.DeletedDate = model.DeletedDate;
+            returnViewModel.IsDeleted = model.IsDeleted;
+
+            return returnViewModel;
+        }
+
+        public TModel ToServiceModel(TViewModel viewModel)
+        {
+            //Todo: return not null
+            if (viewModel == null)
+                return null;
+
+            var model = Activator.CreateInstance<TModel>();
+
+            model.Id = viewModel.Id;
+            model.AddedDate = viewModel.AddedDate;
+            model.ModifiedDate = viewModel.ModifiedDate;
+            model.DeletedDate = viewModel.DeletedDate;
+            model.IsDeleted = viewModel.IsDeleted;
+
+            return model;
+        }
+
+        public IReadOnlyCollection<TViewModel> ToViewModel(IReadOnlyCollection<TModel> models)
+        {
+            if (models.Count == 0)
+            {
+                return Array.Empty<TViewModel>();
+            }
+
+            var subscription = new TViewModel[models.Count];
+            var i = 0;
+            foreach (var model in models)
+            {
+                subscription[i] = ToViewModel(model);
+                ++i;
+            }
+
+            return new ReadOnlyCollection<TViewModel>(subscription);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Services/e-sender/O2NextGen.ESender.Impl/Mappings/EmailRequestMappings.cs b/src/Services/e-sender/O2NextGen.ESender.Impl/Mappings/EmailRequestMappings.cs
index d2f71d06..dd0f9d92 100644
--- a/src/Services/e-sender/O2NextGen.ESender.Impl/Mappings/EmailRequestMappings.cs
+++ b/src/Services/e-sender/O2NextGen.ESender.Impl/Mappings/EmailRequestMappings.cs
@@ -4,20 +4,35 @@
 
 namespace O2NextGen.ESender.Impl.Mappings
 {
-    internal static class EmailRequestMappings 
+    public static class EmailRequestMappings 
     {
-        public static EmailRequest ToService(this MailRequestEntity entity)
+        private static readonly
+            BaseMappings<EmailRequestDbEntity, EmailRequestModel> BaseMappings;
+        
+        static EmailRequestMappings()
         {
-            return entity != null ? new EmailRequest() {Id = entity.Id, From = entity.From, To = entity.To, Body = entity.Body,Subject = entity.Subject} : null;
+            BaseMappings =
+                new BaseMappings<EmailRequestDbEntity, EmailRequestModel>();
+            
+        }
+        public static EmailRequestModel ToModel(this EmailRequestDbEntity dbEntity)
+        {
+            return dbEntity != null ? new EmailRequestModel()
+            {
+                Id = dbEntity.Id, From = dbEntity.From, To = dbEntity.To, Body = dbEntity.Body,Subject = dbEntity.Subject
+            } : null;
         }
     
-        public static MailRequestEntity ToEntity(this EmailRequest model)
+        public static EmailRequestDbEntity ToEntity(this EmailRequestModel model)
         {
-            return model != null ? new MailRequestEntity() {Id = model.Id, From = model.From, To = model.To, Body = model.Body,Subject = model.Subject} : null;
+            return model != null ? new EmailRequestDbEntity()
+            {
+                Id = model.Id, From = model.From, To = model.To, Body = model.Body,Subject = model.Subject
+            } : null;
         }
     
-        public static IReadOnlyCollection<EmailRequest>
-            ToService(this IReadOnlyCollection<MailRequestEntity> entities) =>
-            entities.MapCollection(ToService);
+        public static IReadOnlyCollection<EmailRequestModel>
+            ToModel(this IReadOnlyCollection<EmailRequestDbEntity> entities) =>
+            entities.MapCollection(ToModel);
     }
 }
\ No newline at end of file
diff --git a/src/Services/e-sender/O2NextGen.ESender.Impl/Services/EmailSenderService.cs b/src/Services/e-sender/O2NextGen.ESender.Impl/Services/EmailSenderService.cs
index 70cd2cdf..29aa2678 100644
--- a/src/Services/e-sender/O2NextGen.ESender.Impl/Services/EmailSenderService.cs
+++ b/src/Services/e-sender/O2NextGen.ESender.Impl/Services/EmailSenderService.cs
@@ -29,30 +29,30 @@ public EmailSenderService(ESenderDbContext context)
         #endregion
         
         
-        public async Task<IReadOnlyCollection<EmailRequest>> GetAllAsync(CancellationToken ct)
+        public async Task<IReadOnlyCollection<EmailRequestModel>> GetAllAsync(CancellationToken ct)
         {
             var mailRequestEntities = await _context.MailRequests.AsNoTracking().OrderBy(_=>_.Id).ToListAsync();
-            return mailRequestEntities.ToService();
+            return mailRequestEntities.ToModel();
         }
 
-        public async Task<EmailRequest> GetByIdAsync(long id, CancellationToken ct)
+        public async Task<EmailRequestModel> GetByIdAsync(long id, CancellationToken ct)
         {
             var entity = await _context.MailRequests.AsNoTracking().SingleAsync(x => x.Id == id, ct);
-            return entity.ToService();
+            return entity.ToModel();
         }
 
-        public async Task<EmailRequest> UpdateAsync(EmailRequest certificate, CancellationToken ct)
+        public async Task<EmailRequestModel> UpdateAsync(EmailRequestModel certificate, CancellationToken ct)
         {
             var entityEntry = _context.MailRequests.Update(certificate.ToEntity());
             await _context.SaveChangesAsync(ct);
-            return entityEntry.Entity.ToService();
+            return entityEntry.Entity.ToModel();
         }
         
-        public async Task<EmailRequest> AddAsync(EmailRequest certificate, CancellationToken ct)
+        public async Task<EmailRequestModel> AddAsync(EmailRequestModel certificate, CancellationToken ct)
         {
             var entityEntry = await _context.MailRequests.AddAsync(certificate.ToEntity(), ct);
             await _context.SaveChangesAsync(ct);
-            return entityEntry.Entity.ToService();
+            return entityEntry.Entity.ToModel();
         }
 
         public async Task RemoveAsync(long id, CancellationToken ct)
diff --git a/src/Services/e-sender/O2NextGen.ESender.Impl/Services/InMemoryEmailSenderService.cs b/src/Services/e-sender/O2NextGen.ESender.Impl/Services/InMemoryEmailSenderService.cs
index 90c1a701..92a2cfab 100644
--- a/src/Services/e-sender/O2NextGen.ESender.Impl/Services/InMemoryEmailSenderService.cs
+++ b/src/Services/e-sender/O2NextGen.ESender.Impl/Services/InMemoryEmailSenderService.cs
@@ -12,9 +12,9 @@ public class InMemoryEmailSenderService : IEmailSenderService
     {
         #region Fields
 
-        private static readonly List<EmailRequest> Certificates = new List<EmailRequest>()
+        private static readonly List<EmailRequestModel> Certificates = new List<EmailRequestModel>()
         {
-            new EmailRequest()
+            new EmailRequestModel()
             {
                 Id = 1, From = "from@eexample.com", To = "example@eexample.com", Subject = "theme",
                 Body = "<h1>last</h1>"
@@ -36,19 +36,19 @@ public InMemoryEmailSenderService()
 
         #region Methods
 
-        public async Task<IReadOnlyCollection<EmailRequest>> GetAllAsync(CancellationToken ct)
+        public async Task<IReadOnlyCollection<EmailRequestModel>> GetAllAsync(CancellationToken ct)
         {
             await Task.Delay(3000, ct);
-            return await Task.FromResult<IReadOnlyCollection<EmailRequest>>(Certificates.AsReadOnly());
+            return await Task.FromResult<IReadOnlyCollection<EmailRequestModel>>(Certificates.AsReadOnly());
         }
 
-        public async Task<EmailRequest> GetByIdAsync(long id, CancellationToken ct)
+        public async Task<EmailRequestModel> GetByIdAsync(long id, CancellationToken ct)
         {
             await Task.Delay(3000, ct);
             return await Task.FromResult(Certificates.SingleOrDefault(g => g.Id == id));
         }
 
-        public async Task<EmailRequest> UpdateAsync(EmailRequest certificate, CancellationToken ct)
+        public async Task<EmailRequestModel> UpdateAsync(EmailRequestModel certificate, CancellationToken ct)
         {
             await Task.Delay(5000, ct);
             var toUpdate = Certificates.SingleOrDefault(g => g.Id == certificate.Id);
@@ -63,7 +63,7 @@ public async Task<EmailRequest> UpdateAsync(EmailRequest certificate, Cancellati
             return await Task.FromResult(toUpdate);
         }
 
-        public async Task<EmailRequest> AddAsync(EmailRequest certificate, CancellationToken ct)
+        public async Task<EmailRequestModel> AddAsync(EmailRequestModel certificate, CancellationToken ct)
         {
             await Task.Delay(3000, ct);
             certificate.Id = ++_currentId;
diff --git a/src/Services/e-sender/Tests/IntegrationTests.O2NextGen.ESender.Api/IntegrationTests.O2NextGen.ESender.Api.csproj b/src/Services/e-sender/Tests/IntegrationTests.O2NextGen.ESender.Api/IntegrationTests.O2NextGen.ESender.Api.csproj
index 09b7577b..6658cb02 100644
--- a/src/Services/e-sender/Tests/IntegrationTests.O2NextGen.ESender.Api/IntegrationTests.O2NextGen.ESender.Api.csproj
+++ b/src/Services/e-sender/Tests/IntegrationTests.O2NextGen.ESender.Api/IntegrationTests.O2NextGen.ESender.Api.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/src/Services/e-sender/Tests/IntegrationTests.O2NextGen.ESender.Business/IntegrationTests.O2NextGen.ESender.Business.csproj b/src/Services/e-sender/Tests/IntegrationTests.O2NextGen.ESender.Business/IntegrationTests.O2NextGen.ESender.Business.csproj
index 09b7577b..6658cb02 100644
--- a/src/Services/e-sender/Tests/IntegrationTests.O2NextGen.ESender.Business/IntegrationTests.O2NextGen.ESender.Business.csproj
+++ b/src/Services/e-sender/Tests/IntegrationTests.O2NextGen.ESender.Business/IntegrationTests.O2NextGen.ESender.Business.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/src/Services/e-sender/Tests/IntegrationTests.O2NextGen.ESender.Data/IntegrationTests.O2NextGen.ESender.Data.csproj b/src/Services/e-sender/Tests/IntegrationTests.O2NextGen.ESender.Data/IntegrationTests.O2NextGen.ESender.Data.csproj
index 09b7577b..6658cb02 100644
--- a/src/Services/e-sender/Tests/IntegrationTests.O2NextGen.ESender.Data/IntegrationTests.O2NextGen.ESender.Data.csproj
+++ b/src/Services/e-sender/Tests/IntegrationTests.O2NextGen.ESender.Data/IntegrationTests.O2NextGen.ESender.Data.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/src/Services/e-sender/Tests/IntegrationTests.O2NextGen.ESender.Impl/IntegrationTests.O2NextGen.ESender.Impl.csproj b/src/Services/e-sender/Tests/IntegrationTests.O2NextGen.ESender.Impl/IntegrationTests.O2NextGen.ESender.Impl.csproj
index 09b7577b..6658cb02 100644
--- a/src/Services/e-sender/Tests/IntegrationTests.O2NextGen.ESender.Impl/IntegrationTests.O2NextGen.ESender.Impl.csproj
+++ b/src/Services/e-sender/Tests/IntegrationTests.O2NextGen.ESender.Impl/IntegrationTests.O2NextGen.ESender.Impl.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Api/BaseMappings.cs b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Api/BaseMappings.cs
new file mode 100644
index 00000000..d9645efb
--- /dev/null
+++ b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Api/BaseMappings.cs
@@ -0,0 +1,67 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using O2NextGen.ESender.Api.Extensions;
+using O2NextGen.ESender.Api.Models;
+using O2NextGen.ESender.Business.Models;
+
+namespace UnitTests.O2NextGen.ESender.Api
+{
+    public class BaseMappings<TViewModel, TModel>
+        where TViewModel : class, IViewModel
+        where TModel : class, IBaseModel
+    {
+        public TViewModel ToViewModel(TModel model)
+        {
+            if (model == null)
+                return null;
+
+            var returnViewModel = Activator.CreateInstance<TViewModel>();
+
+            returnViewModel.Id = model.Id;
+            returnViewModel.ExternalId = model.ExternalId;
+            returnViewModel.AddedDate = model.AddedDate;
+            returnViewModel.ModifiedDate = model.ModifiedDate;
+            returnViewModel.DeletedDate = model.DeletedDate;
+            returnViewModel.IsDeleted = model.IsDeleted;
+
+            return returnViewModel;
+        }
+
+        public TModel ToModel(TViewModel viewModel)
+        {
+            //Todo: return not null
+            if (viewModel == null)
+                return null;
+
+            var model = Activator.CreateInstance<TModel>();
+
+            model.Id = viewModel.Id;
+            model.ExternalId = viewModel.ExternalId;
+            model.AddedDate = viewModel.AddedDate ?? default(long);
+            model.ModifiedDate = viewModel.ModifiedDate ?? default(long);
+            model.DeletedDate = viewModel.DeletedDate ?? DateTime.Now.ConvertToUnixTime();
+            model.IsDeleted = viewModel.IsDeleted ?? default(bool);
+
+            return model;
+        }
+
+        public IReadOnlyCollection<TViewModel> ToViewModel(IReadOnlyCollection<TModel> models)
+        {
+            if (models.Count == 0)
+            {
+                return Array.Empty<TViewModel>();
+            }
+
+            var subscription = new TViewModel[models.Count];
+            var i = 0;
+            foreach (var model in models)
+            {
+                subscription[i] = ToViewModel(model);
+                ++i;
+            }
+
+            return new ReadOnlyCollection<TViewModel>(subscription);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Api/BaseMappingsTests.cs b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Api/BaseMappingsTests.cs
new file mode 100644
index 00000000..690d8025
--- /dev/null
+++ b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Api/BaseMappingsTests.cs
@@ -0,0 +1,164 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using NUnit.Framework;
+using O2NextGen.ESender.Api.Extensions;
+
+namespace UnitTests.O2NextGen.ESender.Api
+{
+    public class BaseMappingsTests
+    {
+        private static readonly BaseMappings<FakeViewModel, FakeModel> BaseMappings =
+            new BaseMappings<FakeViewModel, FakeModel>();
+
+        [Test]
+        public void BaseMappingsTests_Map_ViewModelToModel_Id()
+        {
+            var expected = 1;
+            var viewModel = new FakeViewModel { Id = expected };
+
+            var model = BaseMappings.ToModel(viewModel);
+
+            Assert.AreEqual(expected, model.Id);
+        }
+
+        [Test]
+        public void BaseMappingsTests_Map_ModelToViewModel_Id()
+        {
+            var expected = 2;
+            var model = new FakeModel { Id = expected };
+            var serviceModel = BaseMappings.ToViewModel(model);
+            Assert.AreEqual(expected, serviceModel.Id);
+        }
+
+        [Test]
+        public void BaseMappingsTests_Map_ViewModelToModel_ExternalId()
+        {
+            var expected = KeyGenerator.Generate(10);
+            var viewModel = new FakeViewModel { ExternalId = expected };
+
+            var model = BaseMappings.ToModel(viewModel);
+
+            Assert.AreEqual(expected, model.ExternalId);
+        }
+
+        [Test]
+        public void BaseMappingsTests_Map_ModelToViewModel_ExternalIdd()
+        {
+            var expected = KeyGenerator.Generate(10);
+            var model = new FakeModel { ExternalId = expected };
+            var serviceModel = BaseMappings.ToViewModel(model);
+            Assert.AreEqual(expected, serviceModel.ExternalId);
+        }
+
+        [Test]
+        public void BaseMappingsTests_Map_ViewModelToModel_AddedDate()
+        {
+            var expected = DateTime.UtcNow.ConvertToUnixTime();
+            var viewModel = new FakeViewModel { AddedDate = expected };
+
+            var model = BaseMappings.ToModel(viewModel);
+
+            Assert.AreEqual(expected, model.AddedDate);
+        }
+
+        [Test]
+        public void BaseMappingsTests_Map_ModelToViewModel_AddedDate()
+        {
+            var expected = DateTime.UtcNow.ConvertToUnixTime();
+            var model = new FakeModel { AddedDate = expected };
+            var serviceModel = BaseMappings.ToViewModel(model);
+            Assert.AreEqual(expected, serviceModel.AddedDate);
+        }
+
+        [Test]
+        public void BaseMappingsTests_Map_ViewModelToModel_DeletedDate()
+        {
+            var expected = DateTime.UtcNow.ConvertToUnixTime();
+            var viewModel = new FakeViewModel { DeletedDate = expected };
+
+            var model = BaseMappings.ToModel(viewModel);
+
+            Assert.AreEqual(expected, model.DeletedDate);
+        }
+
+        [Test]
+        public void BaseMappingsTests_Map_ModelToViewModel_DeletedDate()
+        {
+            var expected = DateTime.UtcNow.ConvertToUnixTime();
+            var model = new FakeModel { DeletedDate = expected };
+            var serviceModel = BaseMappings.ToViewModel(model);
+            Assert.AreEqual(expected, serviceModel.DeletedDate);
+        }
+
+        [Test]
+        public void BaseMappingsTests_Map_ViewModelToModel_IsDeleted()
+        {
+            const bool expected = true;
+            var viewModel = new FakeViewModel { IsDeleted = expected };
+
+            var model = BaseMappings.ToModel(viewModel);
+
+            Assert.AreEqual(expected, model.IsDeleted);
+        }
+
+        [Test]
+        public void BaseMappingsTests_Map_ModelToViewModel_IsDeleted()
+        {
+            var model = new FakeModel { IsDeleted = true };
+            var serviceModel = BaseMappings.ToViewModel(model);
+            Assert.AreEqual(true, serviceModel.IsDeleted);
+        }
+
+        [Test]
+        public void BaseMappingsTests_Map_ViewModelToModel_ModifiedDate()
+        {
+            var expected = DateTime.UtcNow.ConvertToUnixTime();
+            var viewModel = new FakeViewModel { ModifiedDate = expected };
+
+            var model = BaseMappings.ToModel(viewModel);
+
+            Assert.AreEqual(expected, model.ModifiedDate);
+        }
+
+        [Test]
+        public void BaseMappingsTests_Map_ModelToViewModel_ModifiedDate()
+        {
+            var expected = DateTime.UtcNow.ConvertToUnixTime();
+            var model = new FakeModel { ModifiedDate = expected };
+            var serviceModel = BaseMappings.ToViewModel(model);
+            Assert.AreEqual(expected, serviceModel.ModifiedDate);
+        }
+
+        [Test]
+        public void BaseMappingsTests_Map_ReadOnlyCollection_ModelToViewModel_ModifiedDate()
+        {
+            var expectedId = KeyGenerator.Generate(10);
+
+            var list = new List<FakeViewModel>
+            {
+                new FakeViewModel
+                {
+                    ExternalId = expectedId
+                    // AddedDate = expectedAddedDate
+                }
+            };
+            var expected = new ReadOnlyCollection<FakeViewModel>(list);
+
+            var mList = new List<FakeModel>
+            {
+                new FakeModel
+                {
+                    ExternalId = expectedId
+                    // AddedDate = expectedAddedDate
+                }
+            };
+            var model = mList;
+            var serviceModels = BaseMappings.ToViewModel(model);
+
+            for (var i = 0; i < serviceModels.Count; i++)
+                Assert.AreEqual(expected[i].Id,
+                    ((ReadOnlyCollection<FakeViewModel>)serviceModels)[i].Id);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Api/EmailRequestMappingsTests.cs b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Api/EmailRequestMappingsTests.cs
new file mode 100644
index 00000000..5fc2145c
--- /dev/null
+++ b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Api/EmailRequestMappingsTests.cs
@@ -0,0 +1,86 @@
+using NUnit.Framework;
+using O2NextGen.ESender.Api.Mappings;
+using O2NextGen.ESender.Api.Models;
+using O2NextGen.ESender.Business.Models;
+
+namespace UnitTests.O2NextGen.ESender.Api
+{
+    public class EmailRequestMappingsTests
+    {
+        private static readonly EmailRequestViewModel ViewModel = new EmailRequestViewModel();
+        private static readonly EmailRequestModel Model = new EmailRequestModel();
+        
+        
+        [Test]
+        public void EmailRequestMappingsTests_Map_ModelToViewModel_To()
+        {
+            var expected = "To";
+            Model.To = expected;
+            var packageViewModel = Model.ToViewModel();
+            Assert.AreEqual(expected, packageViewModel.To);
+        }
+
+        [Test]
+        public void EmailRequestMappingsTests_Map_ViewModelToModel_To()
+        {
+            var expected = "To";
+            ViewModel.To = expected;
+            var serviceModel = ViewModel.ToModel();
+            Assert.AreEqual(expected, serviceModel.To);
+        }
+        
+        [Test]
+        public void EmailRequestMappingsTests_Map_ModelToViewModel_Body()
+        {
+            var expected = "Body";
+            Model.Body = expected;
+            var packageViewModel = Model.ToViewModel();
+            Assert.AreEqual(expected, packageViewModel.Body);
+        }
+
+        [Test]
+        public void EmailRequestMappingsTests_Map_ViewModelToModel_Body()
+        {
+            var expected = "Body";
+            ViewModel.Body = expected;
+            var serviceModel = ViewModel.ToModel();
+            Assert.AreEqual(expected, serviceModel.Body);
+        }
+        
+        [Test]
+        public void EmailRequestMappingsTests_Map_ModelToViewModel_From()
+        {
+            var expected = "From";
+            Model.From = expected;
+            var packageViewModel = Model.ToViewModel();
+            Assert.AreEqual(expected, packageViewModel.From);
+        }
+
+        [Test]
+        public void EmailRequestMappingsTests_Map_ViewModelToModel_From()
+        {
+            var expected = "From";
+            ViewModel.From = expected;
+            var serviceModel = ViewModel.ToModel();
+            Assert.AreEqual(expected, serviceModel.From);
+        }
+        
+        [Test]
+        public void EmailRequestMappingsTests_Map_ModelToViewModel_Subject()
+        {
+            var expected = "Subject";
+            Model.Subject = expected;
+            var packageViewModel = Model.ToViewModel();
+            Assert.AreEqual(expected, packageViewModel.Subject);
+        }
+
+        [Test]
+        public void EmailRequestMappingsTests_Map_ViewModelToModel_Subject()
+        {
+            var expected = "Subject";
+            ViewModel.Subject = expected;
+            var serviceModel = ViewModel.ToModel();
+            Assert.AreEqual(expected, serviceModel.Subject);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Api/FakeModel.cs b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Api/FakeModel.cs
new file mode 100644
index 00000000..1a46683c
--- /dev/null
+++ b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Api/FakeModel.cs
@@ -0,0 +1,25 @@
+using System;
+using O2NextGen.ESender.Business.Models;
+
+namespace UnitTests.O2NextGen.ESender.Api
+{
+    public class FakeModel : IBaseModel
+    {
+        public long Id { get; set; }
+        public string ExternalId { get; set; }
+        public long ModifiedDate { get; set; }
+        public long AddedDate { get; set; }
+        public long DeletedDate { get; set; }
+        public bool IsDeleted { get; set; }
+        
+        public void CreateEntity()
+        {
+            throw new NotImplementedException();
+        }
+
+        public void UpdateEntity()
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Api/FakeViewModel.cs b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Api/FakeViewModel.cs
new file mode 100644
index 00000000..550e4729
--- /dev/null
+++ b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Api/FakeViewModel.cs
@@ -0,0 +1,14 @@
+using O2NextGen.ESender.Api.Models;
+
+namespace UnitTests.O2NextGen.ESender.Api
+{
+    public class FakeViewModel : IViewModel
+    {
+        public long Id { get; set; }
+        public string ExternalId { get; set; }
+        public long? ModifiedDate { get; set; }
+        public long? AddedDate { get; set; }
+        public long? DeletedDate { get; set; }
+        public bool? IsDeleted { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Api/UnitTest1.cs b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Api/UnitTest1.cs
deleted file mode 100644
index 32de475f..00000000
--- a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Api/UnitTest1.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using NUnit.Framework;
-
-namespace UnitTests.O2NextGen.ESender.Api
-{
-    public class Tests
-    {
-        [SetUp]
-        public void Setup()
-        {
-        }
-
-        [Test]
-        public void Test1()
-        {
-            Assert.Pass();
-        }
-    }
-}
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Api/UnitTests.O2NextGen.ESender.Api.csproj b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Api/UnitTests.O2NextGen.ESender.Api.csproj
index ea532931..b5beca2d 100644
--- a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Api/UnitTests.O2NextGen.ESender.Api.csproj
+++ b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Api/UnitTests.O2NextGen.ESender.Api.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -12,4 +12,9 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\O2NextGen.ESender.Api\O2NextGen.ESender.Api.csproj" />
+    <ProjectReference Include="..\..\O2NextGen.ESender.Business\O2NextGen.ESender.Business.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Business/Models/BaseHelper.cs b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Business/Models/BaseHelper.cs
new file mode 100644
index 00000000..f7cd3406
--- /dev/null
+++ b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Business/Models/BaseHelper.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Linq;
+
+namespace UnitTests.O2NextGen.ESender.Business.Models
+{
+    public static class BaseHelper<TClass>
+    {
+        public static bool It_CheckExistProperty(string nameProperty)
+        {
+            return typeof(TClass)
+                .GetProperties()
+                .SingleOrDefault(p => p.Name == nameProperty) != null;
+        }
+
+        public static bool It_CheckExistPropertyOfType(string nameProperty, Type type)
+        {
+            return type ==
+                   typeof(TClass).GetProperties().SingleOrDefault(p => p.Name == nameProperty)?.PropertyType;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Business/Models/BaseModelTests.cs b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Business/Models/BaseModelTests.cs
new file mode 100644
index 00000000..f1e89d05
--- /dev/null
+++ b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Business/Models/BaseModelTests.cs
@@ -0,0 +1,97 @@
+using NUnit.Framework;
+using O2NextGen.ESender.Business.Models;
+
+namespace UnitTests.O2NextGen.ESender.Business.Models
+{
+    public class BaseModelTests<TModelClass> : BaseTests<TModelClass>
+        where TModelClass : class
+    {
+        [Test]
+        public void BaseModelTests_NameContainDbEntity()
+        {
+            Assert.IsTrue(typeof(TModelClass).Name.Contains("Model"));
+        }
+        
+        [Test]
+        public void BaseModelTests_Implement_Test()
+        {
+            Assert.IsTrue(typeof(IBaseModel).IsAssignableFrom(typeof(TModelClass)));
+        }
+        
+        #region Check class properties
+        [Test]
+        public void BaseModelTests_Property_Id_ExistProperty_Test()
+        {
+            Assert.IsTrue(BaseHelper<TModelClass>.It_CheckExistProperty("Id"));
+        }
+
+        [Test]
+        public void BaseModelTests_Property_Id_IsType_Test()
+        {
+            Assert.IsTrue(BaseHelper<TModelClass>.It_CheckExistPropertyOfType("Id", typeof(long)));
+        }
+
+        [Test]
+        public void BaseModelTests_Property_ModifiedDate_ExistProperty_Test()
+        {
+            Assert.IsTrue(BaseHelper<TModelClass>.It_CheckExistProperty("ModifiedDate"));
+        }
+
+        [Test]
+        public void BaseModelTests_Property_ModifiedDate_IsType_Test()
+        {
+            Assert.IsTrue(BaseHelper<TModelClass>.It_CheckExistPropertyOfType("ModifiedDate", typeof(long)));
+        }
+
+        [Test]
+        public void BaseModelTests_Property_AddedDate_ExistProperty_Test()
+        {
+            Assert.IsTrue(BaseHelper<TModelClass>.It_CheckExistProperty("AddedDate"));
+        }
+
+        [Test]
+        public void BaseModelTests_Property_AddedDate_IsType_Test()
+        {
+            Assert.IsTrue(BaseHelper<TModelClass>.It_CheckExistPropertyOfType("AddedDate", typeof(long)));
+        }
+        #endregion
+        
+        
+        #region Check function Properties
+
+        [Test]
+        public void BaseModelTests_Property_Id_Test()
+        {
+            var expected = 9;
+            var mailRequestEntity = new EmailRequestModel();
+            
+            mailRequestEntity.Id = expected;
+            
+            Assert.AreEqual(expected,mailRequestEntity.Id);
+        }
+
+        [Test]
+        public void BaseModelTests_Property_AddedDate_Test()
+        {
+            var expected = 9;
+            var mailRequestEntity = new EmailRequestModel();
+            
+            mailRequestEntity.AddedDate = expected;
+            
+            Assert.AreEqual(expected,mailRequestEntity.AddedDate);
+        }
+
+        [Test]
+        public void BaseModelTests_Property_ModifiedDate_Test()
+        {
+            var expected = 9;
+            var mailRequestEntity = new EmailRequestModel();
+            
+            mailRequestEntity.ModifiedDate = expected;
+            
+            Assert.AreEqual(expected,mailRequestEntity.ModifiedDate);
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Business/Models/BaseTests.cs b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Business/Models/BaseTests.cs
new file mode 100644
index 00000000..0cdaa0d2
--- /dev/null
+++ b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Business/Models/BaseTests.cs
@@ -0,0 +1,18 @@
+using NUnit.Framework;
+
+namespace UnitTests.O2NextGen.ESender.Business.Models
+{
+    public class BaseTests<TClass>
+        where TClass : class
+    {
+        #region Check the code style
+
+        [TestCase("BaseTests")]
+        public virtual void It_CheckClassName(string name = "")
+        {
+            Assert.AreEqual(name, typeof(TClass).Name);
+        }
+        #endregion
+
+    }
+}
\ No newline at end of file
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Business/Models/EmailRequestModelTests.cs b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Business/Models/EmailRequestModelTests.cs
new file mode 100644
index 00000000..1d90a42a
--- /dev/null
+++ b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Business/Models/EmailRequestModelTests.cs
@@ -0,0 +1,123 @@
+using NUnit.Framework;
+using O2NextGen.ESender.Business.Models;
+
+namespace UnitTests.O2NextGen.ESender.Business.Models
+{
+    public class EmailRequestModelTests :
+        BaseModelTests<EmailRequestModel>
+    {
+        #region Check the code style
+
+        [Test]
+        [TestCase("EmailRequestModel")]
+        public override void It_CheckClassName(string name = "")
+        {
+            base.It_CheckClassName(name);
+        }
+
+        #endregion
+
+
+        #region Check class properties
+
+        [Test]
+        public void MailRequestEntityTests_Property_From_ExistProperty_Test()
+        {
+            Assert.IsTrue(BaseHelper<EmailRequestModel>.It_CheckExistProperty("From"));
+        }
+
+        [Test]
+        public void MailRequestEntityTests_Property_From_IsType_Test()
+        {
+            Assert.IsTrue(BaseHelper<EmailRequestModel>.It_CheckExistPropertyOfType("From", typeof(string)));
+        }
+
+        [Test]
+        public void MailRequestEntityTests_Property_To_ExistProperty_Test()
+        {
+            Assert.IsTrue(BaseHelper<EmailRequestModel>.It_CheckExistProperty("To"));
+        }
+
+        [Test]
+        public void MailRequestEntityTests_Property_To_IsType_Test()
+        {
+            Assert.IsTrue(BaseHelper<EmailRequestModel>.It_CheckExistPropertyOfType("To", typeof(string)));
+        }
+
+        [Test]
+        public void MailRequestEntityTests_Property_Subject_ExistProperty_Test()
+        {
+            Assert.IsTrue(BaseHelper<EmailRequestModel>.It_CheckExistProperty("Subject"));
+        }
+
+        [Test]
+        public void MailRequestEntityTests_Property_Subject_IsType_Test()
+        {
+            Assert.IsTrue(BaseHelper<EmailRequestModel>.It_CheckExistPropertyOfType("Subject", typeof(string)));
+        }
+
+        [Test]
+        public void MailRequestEntityTests_Property_Body_ExistProperty_Test()
+        {
+            Assert.IsTrue(BaseHelper<EmailRequestModel>.It_CheckExistProperty("Body"));
+        }
+
+        [Test]
+        public void MailRequestEntityTests_Property_Body_IsType_Test()
+        {
+            Assert.IsTrue(BaseHelper<EmailRequestModel>.It_CheckExistPropertyOfType("Body", typeof(string)));
+        }
+
+        #endregion
+
+
+        #region Check function Properties
+
+        [Test]
+        public void MailRequestEntityTests_Property_To_Test()
+        {
+            var expected = "some_test_property_to";
+            var mailRequestEntity = new EmailRequestModel();
+            
+            mailRequestEntity.To = expected;
+            
+            Assert.AreEqual(expected,mailRequestEntity.To);
+        }
+
+        [Test]
+        public void MailRequestEntityTests_Property_From_Test()
+        {
+            var expected = "some_test_property_from";
+            var mailRequestEntity = new EmailRequestModel();
+            
+            mailRequestEntity.From = expected;
+            
+            Assert.AreEqual(expected,mailRequestEntity.From);
+        }
+
+        [Test]
+        public void MailRequestEntityTests_Property_Subject_Test()
+        {
+            var expected = "some_test_property_subject";
+            var mailRequestEntity = new EmailRequestModel();
+            
+            mailRequestEntity.Subject = expected;
+            
+            Assert.AreEqual(expected,mailRequestEntity.Subject);
+        }
+
+        [Test]
+        public void MailRequestEntityTests_Property_Body_Test()
+        {
+            var expected = "some_test_property_body";
+            var mailRequestEntity = new EmailRequestModel();
+            
+            mailRequestEntity.Body = expected;
+            
+            Assert.AreEqual(expected,mailRequestEntity.Body);
+        }
+
+        #endregion
+
+    }
+}
\ No newline at end of file
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Impl/UnitTest1.cs b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Business/Models/EmailRequestTests.cs
similarity index 68%
rename from src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Impl/UnitTest1.cs
rename to src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Business/Models/EmailRequestTests.cs
index 8749d723..c9c5d53c 100644
--- a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Impl/UnitTest1.cs
+++ b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Business/Models/EmailRequestTests.cs
@@ -1,8 +1,8 @@
 using NUnit.Framework;
 
-namespace UnitTests.O2NextGen.ESender.Impl
+namespace UnitTests.O2NextGen.ESender.Business.Models
 {
-    public class Tests
+    public class EmailRequestTests
     {
         [SetUp]
         public void Setup()
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Business/UnitTest1.cs b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Business/UnitTest1.cs
deleted file mode 100644
index 3bf094a7..00000000
--- a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Business/UnitTest1.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using NUnit.Framework;
-
-namespace UnitTests.O2NextGen.ESender.Business
-{
-    public class Tests
-    {
-        [SetUp]
-        public void Setup()
-        {
-        }
-
-        [Test]
-        public void Test1()
-        {
-            Assert.Pass();
-        }
-    }
-}
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Business/UnitTests.O2NextGen.ESender.Business.csproj b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Business/UnitTests.O2NextGen.ESender.Business.csproj
index ea532931..1099c4ee 100644
--- a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Business/UnitTests.O2NextGen.ESender.Business.csproj
+++ b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Business/UnitTests.O2NextGen.ESender.Business.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -12,4 +12,8 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\O2NextGen.ESender.Business\O2NextGen.ESender.Business.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Data/Entities/BaseEntityTests.cs b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Data/Entities/BaseEntityTests.cs
new file mode 100644
index 00000000..07b1748e
--- /dev/null
+++ b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Data/Entities/BaseEntityTests.cs
@@ -0,0 +1,98 @@
+using NUnit.Framework;
+using O2NextGen.ESender.Data.Entities;
+
+namespace UnitTests.O2NextGen.ESender.Data.Entities
+{
+    public class BaseEntityTests<TEntityClass> : BaseTests<TEntityClass>
+        where TEntityClass : class
+    {
+
+        [Test]
+        public void BaseDbEntityTests_NameContainDbEntity()
+        {
+            Assert.IsTrue(typeof(TEntityClass).Name.Contains("DbEntity"));
+        }
+
+        [Test]
+        public void BaseDbEntityTests_Implement_Test()
+        {
+            Assert.IsTrue(typeof(IDbEntity).IsAssignableFrom(typeof(TEntityClass)));
+        }
+        
+        #region Check class properties
+        [Test]
+        public void BaseDbEntityTests_Property_Id_ExistProperty_Test()
+        {
+            Assert.IsTrue(BaseHelper<TEntityClass>.It_CheckExistProperty("Id"));
+        }
+
+        [Test]
+        public void BaseDbEntityTests_Property_Id_IsType_Test()
+        {
+            Assert.IsTrue(BaseHelper<TEntityClass>.It_CheckExistPropertyOfType("Id", typeof(long)));
+        }
+
+        [Test]
+        public void BaseDbEntityTests_Property_ModifiedDate_ExistProperty_Test()
+        {
+            Assert.IsTrue(BaseHelper<TEntityClass>.It_CheckExistProperty("ModifiedDate"));
+        }
+
+        [Test]
+        public void BaseDbEntityTests_Property_ModifiedDate_IsType_Test()
+        {
+            Assert.IsTrue(BaseHelper<TEntityClass>.It_CheckExistPropertyOfType("ModifiedDate", typeof(long)));
+        }
+
+        [Test]
+        public void BaseDbEntityTests_Property_AddedDate_ExistProperty_Test()
+        {
+            Assert.IsTrue(BaseHelper<TEntityClass>.It_CheckExistProperty("AddedDate"));
+        }
+
+        [Test]
+        public void BaseDbEntityTests_Property_AddedDate_IsType_Test()
+        {
+            Assert.IsTrue(BaseHelper<TEntityClass>.It_CheckExistPropertyOfType("AddedDate", typeof(long)));
+        }
+        #endregion
+        
+        
+        #region Check function Properties
+
+        [Test]
+        public void BaseDbEntityTests_Property_Id_Test()
+        {
+            var expected = 9;
+            var mailRequestEntity = new EmailRequestDbEntity();
+            
+            mailRequestEntity.Id = expected;
+            
+            Assert.AreEqual(expected,mailRequestEntity.Id);
+        }
+
+        [Test]
+        public void BaseDbEntityTests_Property_AddedDate_Test()
+        {
+            var expected = 9;
+            var mailRequestEntity = new EmailRequestDbEntity();
+            
+            mailRequestEntity.AddedDate = expected;
+            
+            Assert.AreEqual(expected,mailRequestEntity.AddedDate);
+        }
+
+        [Test]
+        public void BaseDbEntityTests_Property_ModifiedDate_Test()
+        {
+            var expected = 9;
+            var mailRequestEntity = new EmailRequestDbEntity();
+            
+            mailRequestEntity.ModifiedDate = expected;
+            
+            Assert.AreEqual(expected,mailRequestEntity.ModifiedDate);
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Data/Entities/BaseHelper.cs b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Data/Entities/BaseHelper.cs
new file mode 100644
index 00000000..ff22baf4
--- /dev/null
+++ b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Data/Entities/BaseHelper.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Linq;
+
+namespace UnitTests.O2NextGen.ESender.Data.Entities
+{
+    public static class BaseHelper<TClass>
+    {
+        public static bool It_CheckExistProperty(string nameProperty)
+        {
+            return typeof(TClass)
+                .GetProperties()
+                .SingleOrDefault(p => p.Name == nameProperty) != null;
+        }
+
+        public static bool It_CheckExistPropertyOfType(string nameProperty, Type type)
+        {
+            return type ==
+                   typeof(TClass).GetProperties().SingleOrDefault(p => p.Name == nameProperty)?.PropertyType;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Data/Entities/BaseTests.cs b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Data/Entities/BaseTests.cs
new file mode 100644
index 00000000..2d46af69
--- /dev/null
+++ b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Data/Entities/BaseTests.cs
@@ -0,0 +1,18 @@
+using NUnit.Framework;
+
+namespace UnitTests.O2NextGen.ESender.Data.Entities
+{
+    public class BaseTests<TClass>
+        where TClass : class
+    {
+        #region Check the code style
+
+        [TestCase("BaseTests")]
+        public virtual void It_CheckClassName(string name = "")
+        {
+            Assert.AreEqual(name, typeof(TClass).Name);
+        }
+        #endregion
+
+    }
+}
\ No newline at end of file
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Data/Entities/MailRequestEntityTests.cs b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Data/Entities/MailRequestEntityTests.cs
new file mode 100644
index 00000000..98aae209
--- /dev/null
+++ b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Data/Entities/MailRequestEntityTests.cs
@@ -0,0 +1,123 @@
+using NUnit.Framework;
+using O2NextGen.ESender.Data.Entities;
+
+namespace UnitTests.O2NextGen.ESender.Data.Entities
+{
+    public class MailRequestEntityTests :
+        BaseEntityTests<EmailRequestDbEntity>
+    {
+        #region Check the code style
+
+        [Test]
+        [TestCase("EmailRequestDbEntity")]
+        public override void It_CheckClassName(string name = "")
+        {
+            base.It_CheckClassName(name);
+        }
+
+        #endregion
+
+
+        #region Check class properties
+
+        [Test]
+        public void MailRequestEntityTests_Property_From_ExistProperty_Test()
+        {
+            Assert.IsTrue(BaseHelper<EmailRequestDbEntity>.It_CheckExistProperty("From"));
+        }
+
+        [Test]
+        public void MailRequestEntityTests_Property_From_IsType_Test()
+        {
+            Assert.IsTrue(BaseHelper<EmailRequestDbEntity>.It_CheckExistPropertyOfType("From", typeof(string)));
+        }
+
+        [Test]
+        public void MailRequestEntityTests_Property_To_ExistProperty_Test()
+        {
+            Assert.IsTrue(BaseHelper<EmailRequestDbEntity>.It_CheckExistProperty("To"));
+        }
+
+        [Test]
+        public void MailRequestEntityTests_Property_To_IsType_Test()
+        {
+            Assert.IsTrue(BaseHelper<EmailRequestDbEntity>.It_CheckExistPropertyOfType("To", typeof(string)));
+        }
+
+        [Test]
+        public void MailRequestEntityTests_Property_Subject_ExistProperty_Test()
+        {
+            Assert.IsTrue(BaseHelper<EmailRequestDbEntity>.It_CheckExistProperty("Subject"));
+        }
+
+        [Test]
+        public void MailRequestEntityTests_Property_Subject_IsType_Test()
+        {
+            Assert.IsTrue(BaseHelper<EmailRequestDbEntity>.It_CheckExistPropertyOfType("Subject", typeof(string)));
+        }
+
+        [Test]
+        public void MailRequestEntityTests_Property_Body_ExistProperty_Test()
+        {
+            Assert.IsTrue(BaseHelper<EmailRequestDbEntity>.It_CheckExistProperty("Body"));
+        }
+
+        [Test]
+        public void MailRequestEntityTests_Property_Body_IsType_Test()
+        {
+            Assert.IsTrue(BaseHelper<EmailRequestDbEntity>.It_CheckExistPropertyOfType("Body", typeof(string)));
+        }
+
+        #endregion
+
+
+        #region Check function Properties
+
+        [Test]
+        public void MailRequestEntityTests_Property_To_Test()
+        {
+            var expected = "some_test_property_to";
+            var mailRequestEntity = new EmailRequestDbEntity();
+            
+            mailRequestEntity.To = expected;
+            
+            Assert.AreEqual(expected,mailRequestEntity.To);
+        }
+
+        [Test]
+        public void MailRequestEntityTests_Property_From_Test()
+        {
+            var expected = "some_test_property_from";
+            var mailRequestEntity = new EmailRequestDbEntity();
+            
+            mailRequestEntity.From = expected;
+            
+            Assert.AreEqual(expected,mailRequestEntity.From);
+        }
+
+        [Test]
+        public void MailRequestEntityTests_Property_Subject_Test()
+        {
+            var expected = "some_test_property_subject";
+            var mailRequestEntity = new EmailRequestDbEntity();
+            
+            mailRequestEntity.Subject = expected;
+            
+            Assert.AreEqual(expected,mailRequestEntity.Subject);
+        }
+
+        [Test]
+        public void MailRequestEntityTests_Property_Body_Test()
+        {
+            var expected = "some_test_property_body";
+            var mailRequestEntity = new EmailRequestDbEntity();
+            
+            mailRequestEntity.Body = expected;
+            
+            Assert.AreEqual(expected,mailRequestEntity.Body);
+        }
+
+        #endregion
+
+    }
+}
\ No newline at end of file
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Data/UnitTest1.cs b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Data/UnitTest1.cs
deleted file mode 100644
index e44c9867..00000000
--- a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Data/UnitTest1.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using NUnit.Framework;
-
-namespace UnitTests.O2NextGen.ESender.Data
-{
-    public class Tests
-    {
-        [SetUp]
-        public void Setup()
-        {
-        }
-
-        [Test]
-        public void Test1()
-        {
-            Assert.Pass();
-        }
-    }
-}
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Data/UnitTests.O2NextGen.ESender.Data.csproj b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Data/UnitTests.O2NextGen.ESender.Data.csproj
index ea532931..da9e9810 100644
--- a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Data/UnitTests.O2NextGen.ESender.Data.csproj
+++ b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Data/UnitTests.O2NextGen.ESender.Data.csproj
@@ -1,15 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Moq" Version="4.16.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\O2NextGen.ESender.Data\O2NextGen.ESender.Data.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Impl/EmailRequestMappingsTests.cs b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Impl/EmailRequestMappingsTests.cs
new file mode 100644
index 00000000..38e7ca87
--- /dev/null
+++ b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Impl/EmailRequestMappingsTests.cs
@@ -0,0 +1,145 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using NUnit.Framework;
+using O2NextGen.ESender.Api.Extensions;
+using O2NextGen.ESender.Api.Models;
+using O2NextGen.ESender.Business.Models;
+using O2NextGen.ESender.Data.Entities;
+using O2NextGen.ESender.Impl.Mappings;
+
+namespace UnitTests.O2NextGen.ESender.Impl
+{
+    public class BaseMappings<TViewModel, TModel>
+        where TViewModel : class, IViewModel
+        where TModel : class, IBaseModel
+    {
+        public TViewModel ToViewModel(TModel model)
+        {
+            if (model == null)
+                return null;
+
+            var returnViewModel = Activator.CreateInstance<TViewModel>();
+
+            returnViewModel.Id = model.Id;
+            returnViewModel.AddedDate = model.AddedDate;
+            returnViewModel.ModifiedDate = model.ModifiedDate;
+            returnViewModel.DeletedDate = model.DeletedDate;
+            returnViewModel.IsDeleted = model.IsDeleted;
+
+            return returnViewModel;
+        }
+
+        public TModel ToServiceModel(TViewModel viewModel)
+        {
+            //Todo: return not null
+            if (viewModel == null)
+                return null;
+
+            var model = Activator.CreateInstance<TModel>();
+
+            model.Id = viewModel.Id;
+            model.AddedDate = viewModel.AddedDate ?? default(long);
+            model.ModifiedDate = viewModel.ModifiedDate ?? default(long);
+            model.DeletedDate = viewModel.DeletedDate ?? DateTime.Now.ConvertToUnixTime();
+            model.IsDeleted = viewModel.IsDeleted ?? default(bool);
+
+            return model;
+        }
+
+        public IReadOnlyCollection<TViewModel> ToViewModel(IReadOnlyCollection<TModel> models)
+        {
+            if (models.Count == 0)
+            {
+                return Array.Empty<TViewModel>();
+            }
+
+            var subscription = new TViewModel[models.Count];
+            var i = 0;
+            foreach (var model in models)
+            {
+                subscription[i] = ToViewModel(model);
+                ++i;
+            }
+
+            return new ReadOnlyCollection<TViewModel>(subscription);
+        }
+    }
+    public class EmailRequestMappingsTests
+    {
+        private static readonly EmailRequestDbEntity Entity = new EmailRequestDbEntity();
+        private static readonly EmailRequestModel Model = new EmailRequestModel();
+        
+        [Test]
+        public void EmailRequestMappingsTests_Map_ModelToViewModel_To()
+        {
+            var expected = "To";
+            Model.To = expected;
+            var packageViewModel = Model.ToEntity();
+            Assert.AreEqual(expected, packageViewModel.To);
+        }
+
+        [Test]
+        public void EmailRequestMappingsTests_Map_ViewModelToModel_To()
+        {
+            var expected = "To";
+            Entity.To = expected;
+            var serviceModel = Entity.ToModel();
+            Assert.AreEqual(expected, serviceModel.To);
+        }
+        
+        [Test]
+        public void EmailRequestMappingsTests_Map_ModelToViewModel_Body()
+        {
+            var expected = "Body";
+            Model.Body = expected;
+            var packageViewModel = Model.ToEntity();
+            Assert.AreEqual(expected, packageViewModel.Body);
+        }
+
+        [Test]
+        public void EmailRequestMappingsTests_Map_ViewModelToModel_Body()
+        {
+            var expected = "Body";
+            Entity.Body = expected;
+            var serviceModel = Entity.ToModel();
+            Assert.AreEqual(expected, serviceModel.Body);
+        }
+        
+        [Test]
+        public void EmailRequestMappingsTests_Map_ModelToViewModel_From()
+        {
+            var expected = "From";
+            Model.From = expected;
+            var packageViewModel = Model.ToEntity();
+            Assert.AreEqual(expected, packageViewModel.From);
+        }
+
+        [Test]
+        public void EmailRequestMappingsTests_Map_ViewModelToModel_From()
+        {
+            var expected = "From";
+            Entity.From = expected;
+            var serviceModel = Entity.ToModel();
+            Assert.AreEqual(expected, serviceModel.From);
+        }
+        
+        [Test]
+        public void EmailRequestMappingsTests_Map_ModelToViewModel_Subject()
+        {
+            var expected = "Subject";
+            Model.Subject = expected;
+            var packageViewModel = Model.ToEntity();
+            Assert.AreEqual(expected, packageViewModel.Subject);
+        }
+
+        [Test]
+        public void EmailRequestMappingsTests_Map_ViewModelToModel_Subject()
+        {
+            var expected = "Subject";
+            Entity.Subject = expected;
+            var serviceModel = Entity.ToModel();
+            Assert.AreEqual(expected, serviceModel.Subject);
+        }
+    }
+}
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Impl/UnitTests.O2NextGen.ESender.Impl.csproj b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Impl/UnitTests.O2NextGen.ESender.Impl.csproj
index ea532931..a7d0d793 100644
--- a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Impl/UnitTests.O2NextGen.ESender.Impl.csproj
+++ b/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Impl/UnitTests.O2NextGen.ESender.Impl.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -12,4 +12,11 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\O2NextGen.ESender.Api\O2NextGen.ESender.Api.csproj" />
+    <ProjectReference Include="..\..\O2NextGen.ESender.Business\O2NextGen.ESender.Business.csproj" />
+    <ProjectReference Include="..\..\O2NextGen.ESender.Data\O2NextGen.ESender.Data.csproj" />
+    <ProjectReference Include="..\..\O2NextGen.ESender.Impl\O2NextGen.ESender.Impl.csproj" />
+  </ItemGroup>
+
 </Project>