diff --git a/zero.Core/Api/ApplicationsApi.cs b/zero.Core/Api/ApplicationsApi.cs
index 19cd16b0..a3f16323 100644
--- a/zero.Core/Api/ApplicationsApi.cs
+++ b/zero.Core/Api/ApplicationsApi.cs
@@ -10,54 +10,54 @@ namespace zero.Core.Api
 {
   public class ApplicationsApi : BackofficeApi, IApplicationsApi
   {
-    IValidator<IApplication> Validator;
+    IValidator<Application> Validator;
 
 
-    public ApplicationsApi(IBackofficeStore store, IValidator<IApplication> validator) : base(store, isCoreDatabase: true)
+    public ApplicationsApi(IBackofficeStore store, IValidator<Application> validator) : base(store, isCoreDatabase: true)
     {
       Validator = validator;
     }
 
 
     /// <inheritdoc />
-    public async Task<IApplication> GetById(string id)
+    public async Task<Application> GetById(string id)
     {
-      return await GetById<IApplication>(id);
+      return await GetById<Application>(id);
     }
 
 
     /// <inheritdoc />
-    public async Task<IList<IApplication>> GetAll()
+    public async Task<IList<Application>> GetAll()
     {
       using IAsyncDocumentSession session = Session();
       return await session
-        .Query<IApplication>()
+        .Query<Application>()
         .OrderByDescending(x => x.CreatedDate)
         .ToListAsync();
     }
 
 
     /// <inheritdoc />
-    public async Task<ListResult<IApplication>> GetByQuery(ListQuery<IApplication> query)
+    public async Task<ListResult<Application>> GetByQuery(ListQuery<Application> query)
     {
       query.SearchFor(entity => entity.Name);
 
       using IAsyncDocumentSession session = Session();
-      return await session.Query<IApplication>().ToQueriedListAsync(query);
+      return await session.Query<Application>().ToQueriedListAsync(query);
     }
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<IApplication>> Save(IApplication model)
+    public async Task<EntityResult<Application>> Save(Application model)
     {
       return await SaveModel(model, Validator);
     }
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<IApplication>> Delete(string id)
+    public async Task<EntityResult<Application>> Delete(string id)
     {
-      return await DeleteById<IApplication>(id);
+      return await DeleteById<Application>(id);
     }
   }
 
@@ -67,26 +67,26 @@ namespace zero.Core.Api
     /// <summary>
     /// Get application by Id
     /// </summary>
-    Task<IApplication> GetById(string id);
+    Task<Application> GetById(string id);
 
     /// <summary>
     /// Get all available zero applications
     /// </summary>
-    Task<IList<IApplication>> GetAll();
+    Task<IList<Application>> GetAll();
 
     /// <summary>
     /// Get all available applications (with query)
     /// </summary>
-    Task<ListResult<IApplication>> GetByQuery(ListQuery<IApplication> query);
+    Task<ListResult<Application>> GetByQuery(ListQuery<Application> query);
 
     /// <summary>
     /// Creates or updates a application
     /// </summary>
-    Task<EntityResult<IApplication>> Save(IApplication model);
+    Task<EntityResult<Application>> Save(Application model);
 
     /// <summary>
     /// Deletes a application by Id
     /// </summary>
-    Task<EntityResult<IApplication>> Delete(string id);
+    Task<EntityResult<Application>> Delete(string id);
   }
 }
diff --git a/zero.Core/Api/AuthenticationApi.cs b/zero.Core/Api/AuthenticationApi.cs
index 79dc9fe9..bcc7b144 100644
--- a/zero.Core/Api/AuthenticationApi.cs
+++ b/zero.Core/Api/AuthenticationApi.cs
@@ -141,7 +141,7 @@ namespace zero.Core.Api
     /// <inheritdoc />
     public async Task<bool> TrySwitchApp(string appId)
     {
-      IBackofficeUser user = await GetUser();
+      BackofficeUser user = await GetUser();
 
       if (user == null || appId.IsNullOrEmpty())
       {
diff --git a/zero.Core/Api/AuthorizationApi.cs b/zero.Core/Api/AuthorizationApi.cs
index a5561022..74740c81 100644
--- a/zero.Core/Api/AuthorizationApi.cs
+++ b/zero.Core/Api/AuthorizationApi.cs
@@ -76,7 +76,7 @@ namespace zero.Core.Api
     }
 
 
-    public EntityPermission GetPermissionForEntity<T>(T model, string permissionKey) where T : IZeroEntity
+    public EntityPermission GetPermissionForEntity<T>(T model, string permissionKey) where T : ZeroEntity
     {
       EntityPermission result = new EntityPermission();
 
diff --git a/zero.Core/Api/BackofficeApi.cs b/zero.Core/Api/BackofficeApi.cs
index 67d6b36e..00e6688e 100644
--- a/zero.Core/Api/BackofficeApi.cs
+++ b/zero.Core/Api/BackofficeApi.cs
@@ -53,7 +53,7 @@ namespace zero.Core.Api
 
 
     /// <inheritdoc />
-    public async Task<T> GetById<T>(string id) where T : IZeroIdEntity
+    public async Task<T> GetById<T>(string id) where T : ZeroIdEntity
     {
       if (id.IsNullOrWhiteSpace())
       {
@@ -66,7 +66,7 @@ namespace zero.Core.Api
 
 
     /// <inheritdoc />
-    public async Task<Dictionary<string, T>> GetByIds<T>(params string[] ids) where T : IZeroIdEntity
+    public async Task<Dictionary<string, T>> GetByIds<T>(params string[] ids) where T : ZeroIdEntity
     {
       using IAsyncDocumentSession session = Session();
       Dictionary<string, T> models = await session.LoadAsync<T>(ids);
@@ -84,7 +84,7 @@ namespace zero.Core.Api
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<T>> SaveModel<T>(T model, IValidator<T> validator = null, Action<IMetadataDictionary> meta = null) where T : IZeroEntity
+    public async Task<EntityResult<T>> SaveModel<T>(T model, IValidator<T> validator = null, Action<IMetadataDictionary> meta = null) where T : ZeroEntity
     {
       // check for alias
       //if (model is IUrlAliasEntity)
@@ -150,11 +150,7 @@ namespace zero.Core.Api
       {
         model.CreatedDate = DateTimeOffset.Now;
         model.CreatedById = userId;
-
-        if (model is ILanguageAwareEntity)
-        {
-          (model as ILanguageAwareEntity).LanguageId = "languages.1-A"; // TODO correct language id
-        }
+        model.LanguageId = "languages.1-A"; // TODO correct language id
       }
 
       // update name alias and last modified
@@ -179,7 +175,7 @@ namespace zero.Core.Api
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<T>> DeleteById<T>(string id) where T : IZeroIdEntity
+    public async Task<EntityResult<T>> DeleteById<T>(string id) where T : ZeroIdEntity
     {
       using IAsyncDocumentSession session = Session();
       session.Advanced.WaitForIndexesAfterSaveChanges(throwOnTimeout: false);
@@ -200,7 +196,7 @@ namespace zero.Core.Api
 
 
     /// <inheritdoc />
-    public async Task<int> DeleteByIds<T>(params string[] ids) where T : IZeroIdEntity
+    public async Task<int> DeleteByIds<T>(params string[] ids) where T : ZeroIdEntity
     {
       int successCount = 0;
 
@@ -230,28 +226,28 @@ namespace zero.Core.Api
     /// Get an entity by Id.
     /// If the requested entity is an IAppAwareEntity it will only return entities for the currently selected app + shared app
     /// </summary>
-    Task<T> GetById<T>(string id) where T : IZeroIdEntity;
+    Task<T> GetById<T>(string id) where T : ZeroIdEntity;
 
     /// <summary>
     /// Get entities by ids.
     /// If the requested entity is an IAppAwareEntity it will only return entities for the currently selected app + shared app
     /// </summary>
-    Task<Dictionary<string, T>> GetByIds<T>(params string[] ids) where T : IZeroIdEntity;
+    Task<Dictionary<string, T>> GetByIds<T>(params string[] ids) where T : ZeroIdEntity;
 
     /// <summary>
     /// Updates or creates an entity with an optional validator
     /// </summary>
-    Task<EntityResult<T>> SaveModel<T>(T model, IValidator<T> validator = null, Action<IMetadataDictionary> meta = null) where T : IZeroEntity;
+    Task<EntityResult<T>> SaveModel<T>(T model, IValidator<T> validator = null, Action<IMetadataDictionary> meta = null) where T : ZeroEntity;
 
     /// <summary>
     /// Deletes an entity by Id
     /// </summary>
-    Task<EntityResult<T>> DeleteById<T>(string id) where T : IZeroIdEntity;
+    Task<EntityResult<T>> DeleteById<T>(string id) where T : ZeroIdEntity;
 
     /// <summary>
     /// Deletes entities by Id
     /// </summary>
-    Task<int> DeleteByIds<T>(params string[] ids) where T : IZeroIdEntity;
+    Task<int> DeleteByIds<T>(params string[] ids) where T : ZeroIdEntity;
 
     /// <summary>
     /// Delete a whole collection (with an optional query suffix, i.e. a where statement)
diff --git a/zero.Core/Api/ExportApi.cs b/zero.Core/Api/ExportApi.cs
index d7ac8929..7a9b35a4 100644
--- a/zero.Core/Api/ExportApi.cs
+++ b/zero.Core/Api/ExportApi.cs
@@ -31,6 +31,6 @@
 //    /// <summary>
 //    /// Returns a space by a defined generic
 //    /// </summary>
-//    Space GetBy<T>() where T : ISpaceContent;
+//    Space GetBy<T>() where T : SpaceContent;
 //  }
 //}
diff --git a/zero.Core/Api/MediaApi.cs b/zero.Core/Api/MediaApi.cs
index 9354f088..43c5d093 100644
--- a/zero.Core/Api/MediaApi.cs
+++ b/zero.Core/Api/MediaApi.cs
@@ -39,7 +39,7 @@ namespace zero.Core.Api
 
 
     /// <inheritdoc />
-    public async Task<IMedia> GetById(string id)
+    public async Task<Media> GetById(string id)
     {
       return await GetById<Media>(id);
     }
@@ -50,7 +50,7 @@ namespace zero.Core.Api
     {
       using IAsyncDocumentSession session = isCoreDatabase ? Store.OpenCoreSession() : Store.OpenAsyncSession();
 
-      IMedia media = await session.LoadAsync<IMedia>(id);
+      Media media = await session.LoadAsync<Media>(id);
 
       if (media == null)
       {
@@ -67,23 +67,23 @@ namespace zero.Core.Api
 
 
     /// <inheritdoc />
-    public async Task<Dictionary<string, IMedia>> GetById(IEnumerable<string> ids)
+    public async Task<Dictionary<string, Media>> GetById(IEnumerable<string> ids)
     {
       using (IAsyncDocumentSession session = Store.OpenAsyncSession())
       {
-        return await session.LoadAsync<IMedia>(ids);
+        return await session.LoadAsync<Media>(ids);
       }
     }
 
 
     /// <inheritdoc />
-    public async Task<ListResult<IMedia>> GetByQuery(MediaListQuery query)
+    public async Task<ListResult<Media>> GetByQuery(MediaListQuery query)
     {
       query.SearchFor(entity => entity.Name);
 
       using (IAsyncDocumentSession session = Store.OpenAsyncSession())
       {
-        return await session.Query<IMedia>()
+        return await session.Query<Media>()
           .WhereIf(x => x.FolderId == query.FolderId, !query.FolderId.IsNullOrEmpty(), x => x.FolderId == null)
           .ToQueriedListAsync(query);
       }
@@ -137,7 +137,7 @@ namespace zero.Core.Api
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<IMedia>> Save(IMedia model)
+    public async Task<EntityResult<Media>> Save(Media model)
     {
       model.IsActive = true;
       return await SaveModel(model);
@@ -145,14 +145,14 @@ namespace zero.Core.Api
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<IMedia>> Move(string id, string parentId)
+    public async Task<EntityResult<Media>> Move(string id, string parentId)
     {
-      IMedia model = await GetById<IMedia>(id);
-      IMediaFolder parent = await GetById<IMediaFolder>(parentId);
+      Media model = await GetById<Media>(id);
+      MediaFolder parent = await GetById<MediaFolder>(parentId);
 
       if (model == null || (!parentId.IsNullOrEmpty() && parent == null))
       {
-        return EntityResult<IMedia>.Fail("@errors.idnotfound");
+        return EntityResult<Media>.Fail("@errors.idnotfound");
       }
 
       model.FolderId = parent?.Id;
@@ -162,9 +162,9 @@ namespace zero.Core.Api
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<IMedia>> Delete(string id)
+    public async Task<EntityResult<Media>> Delete(string id)
     {
-      return await DeleteById<IMedia>(id);
+      return await DeleteById<Media>(id);
     }
 
 
@@ -237,7 +237,7 @@ namespace zero.Core.Api
     /// <summary>
     /// Saves a thumbnail of an image
     /// </summary>
-    string SaveThumbnail(IMedia media, Image<Rgba32> image, string extensionPrefix, ResizeOptions resizeOptions)
+    string SaveThumbnail(Media media, Image<Rgba32> image, string extensionPrefix, ResizeOptions resizeOptions)
     {
       string extension = Path.GetExtension(media.Source);
 
@@ -275,7 +275,7 @@ namespace zero.Core.Api
     /// <summary>
     /// Get media by Id
     /// </summary>
-    Task<IMedia> GetById(string id);
+    Task<Media> GetById(string id);
 
     /// <summary>
     /// Get media source by Id
@@ -285,12 +285,12 @@ namespace zero.Core.Api
     /// <summary>
     /// Get media by ids
     /// </summary>
-    Task<Dictionary<string, IMedia>> GetById(IEnumerable<string> ids);
+    Task<Dictionary<string, Media>> GetById(IEnumerable<string> ids);
 
     /// <summary>
     /// Get all available media items with query
     /// </summary>
-    Task<ListResult<IMedia>> GetByQuery(MediaListQuery query);
+    Task<ListResult<Media>> GetByQuery(MediaListQuery query);
 
     /// <summary>
     /// Get all available media items (including folders) with query
@@ -300,17 +300,17 @@ namespace zero.Core.Api
     /// <summary>
     /// Creates or updates a media item
     /// </summary>
-    Task<EntityResult<IMedia>> Save(IMedia model);
+    Task<EntityResult<Media>> Save(Media model);
 
     /// <summary>
     /// Move a file to a new parent
     /// </summary>
-    Task<EntityResult<IMedia>> Move(string id, string parentId);
+    Task<EntityResult<Media>> Move(string id, string parentId);
 
     /// <summary>
     /// Deletes a media item by Id
     /// </summary>
-    Task<EntityResult<IMedia>> Delete(string id);
+    Task<EntityResult<Media>> Delete(string id);
 
     /// <summary>
     /// Clean-up all media based on stored database information
diff --git a/zero.Core/Api/MediaFolderApi.cs b/zero.Core/Api/MediaFolderApi.cs
index d7d70b17..762431e9 100644
--- a/zero.Core/Api/MediaFolderApi.cs
+++ b/zero.Core/Api/MediaFolderApi.cs
@@ -14,28 +14,28 @@ namespace zero.Core.Api
 {
   public class MediaFolderApi : BackofficeApi, IMediaFolderApi
   {
-    IValidator<IMediaFolder> Validator;
+    IValidator<MediaFolder> Validator;
 
 
-    public MediaFolderApi(IBackofficeStore store, IValidator<IMediaFolder> validator) : base(store)
+    public MediaFolderApi(IBackofficeStore store, IValidator<MediaFolder> validator) : base(store)
     {
       Validator = validator;
     }
 
 
     /// <inheritdoc />
-    public async Task<IMediaFolder> GetById(string id)
+    public async Task<MediaFolder> GetById(string id)
     {
-      return await GetById<IMediaFolder>(id);
+      return await GetById<MediaFolder>(id);
     }
 
 
     /// <inheritdoc />
-    public async Task<IList<IMediaFolder>> GetAll(string parentId = null)
+    public async Task<IList<MediaFolder>> GetAll(string parentId = null)
     {
       using (IAsyncDocumentSession session = Store.OpenAsyncSession())
       {
-        return await session.Query<IMediaFolder>()
+        return await session.Query<MediaFolder>()
           .WhereIf(x => x.ParentId == parentId, !parentId.IsNullOrEmpty(), x => x.ParentId == null)
           .OrderByDescending(x => x.Name)
           .ToListAsync();
@@ -51,7 +51,7 @@ namespace zero.Core.Api
 
       using (IAsyncDocumentSession session = Store.OpenAsyncSession())
       {
-        IList<IMediaFolder> folders = await session.Query<IMediaFolder>()
+        IList<MediaFolder> folders = await session.Query<MediaFolder>()
           .WhereIf(x => x.ParentId == parentId, !parentId.IsNullOrEmpty(), x => x.ParentId == null)
           .OrderByDescending(x => x.CreatedDate).ThenBy(x => x.Name)
           .ToListAsync();
@@ -62,7 +62,7 @@ namespace zero.Core.Api
         {
           MediaFolder_ByHierarchy.Result result = await session.Query<MediaFolder_ByHierarchy.Result, MediaFolder_ByHierarchy>()
             .ProjectInto<MediaFolder_ByHierarchy.Result>()
-            .Include<MediaFolder_ByHierarchy.Result, IMediaFolder>(x => x.Path.Select(p => p.Id))
+            .Include<MediaFolder_ByHierarchy.Result, MediaFolder>(x => x.Path.Select(p => p.Id))
             .FirstOrDefaultAsync(x => x.Id == activeId);
 
           if (result != null)
@@ -81,7 +81,7 @@ namespace zero.Core.Api
           .ToListAsync();
 
 
-        foreach (IMediaFolder folder in folders)
+        foreach (MediaFolder folder in folders)
         {
           int childCount = children.Count(x => x.Id == folder.Id);
 
@@ -124,30 +124,30 @@ namespace zero.Core.Api
 
 
     /// <inheritdoc />
-    public async Task<IList<IMediaFolder>> GetHierarchy(string id)
+    public async Task<IList<MediaFolder>> GetHierarchy(string id)
     {
       using (IAsyncDocumentSession session = Store.OpenAsyncSession())
       {
         MediaFolder_ByHierarchy.Result result = await session.Query<MediaFolder_ByHierarchy.Result, MediaFolder_ByHierarchy>()
           .ProjectInto<MediaFolder_ByHierarchy.Result>()
-          .Include<MediaFolder_ByHierarchy.Result, IMediaFolder>(x => x.Path.Select(p => p.Id))
+          .Include<MediaFolder_ByHierarchy.Result, MediaFolder>(x => x.Path.Select(p => p.Id))
           .FirstOrDefaultAsync(x => x.Id == id);
 
         if (result == null)
         {
-          return new List<IMediaFolder>();
+          return new List<MediaFolder>();
         }
 
         List<string> ids = result.Path.Select(x => x.Id).ToList();
         ids.Add(id);
 
-        return (await session.LoadAsync<IMediaFolder>(ids)).Select(x => x.Value).ToList();
+        return (await session.LoadAsync<MediaFolder>(ids)).Select(x => x.Value).ToList();
       }
     }
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<IMediaFolder>> Save(IMediaFolder model)
+    public async Task<EntityResult<MediaFolder>> Save(MediaFolder model)
     {
       model.IsActive = true;
       return await SaveModel(model, Validator);
@@ -155,14 +155,14 @@ namespace zero.Core.Api
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<IMediaFolder>> Move(string id, string parentId)
+    public async Task<EntityResult<MediaFolder>> Move(string id, string parentId)
     {
-      IMediaFolder model = await GetById<IMediaFolder>(id);
-      IMediaFolder parent = await GetById<IMediaFolder>(parentId);
+      MediaFolder model = await GetById<MediaFolder>(id);
+      MediaFolder parent = await GetById<MediaFolder>(parentId);
 
       if (model == null || (!parentId.IsNullOrEmpty() && parent == null))
       {
-        return EntityResult<IMediaFolder>.Fail("@errors.idnotfound");
+        return EntityResult<MediaFolder>.Fail("@errors.idnotfound");
       }
 
       model.ParentId = parent?.Id;
@@ -172,9 +172,9 @@ namespace zero.Core.Api
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<IMediaFolder>> Delete(string id)
+    public async Task<EntityResult<MediaFolder>> Delete(string id)
     {
-      return await DeleteById<IMediaFolder>(id);
+      return await DeleteById<MediaFolder>(id);
     }
   }
 
@@ -184,17 +184,17 @@ namespace zero.Core.Api
     /// <summary>
     /// Get application by Id
     /// </summary>
-    Task<IMediaFolder> GetById(string id);
+    Task<MediaFolder> GetById(string id);
 
     /// <summary>
     /// Get hierarchy for a folder
     /// </summary>
-    Task<IList<IMediaFolder>> GetHierarchy(string id);
+    Task<IList<MediaFolder>> GetHierarchy(string id);
 
     /// <summary>
     /// Get all folders with the specified parent or on root
     /// </summary>
-    Task<IList<IMediaFolder>> GetAll(string parentId = null);
+    Task<IList<MediaFolder>> GetAll(string parentId = null);
 
     /// <summary>
     /// Get all folders with the specified parent or on root for tree output
@@ -204,16 +204,16 @@ namespace zero.Core.Api
     /// <summary>
     /// Creates or updates a folder
     /// </summary>
-    Task<EntityResult<IMediaFolder>> Save(IMediaFolder model);
+    Task<EntityResult<MediaFolder>> Save(MediaFolder model);
 
     /// <summary>
     /// Move a folder to a new parent
     /// </summary>
-    Task<EntityResult<IMediaFolder>> Move(string id, string parentId);
+    Task<EntityResult<MediaFolder>> Move(string id, string parentId);
 
     /// <summary>
     /// Deletes a folder
     /// </summary>
-    Task<EntityResult<IMediaFolder>> Delete(string id);
+    Task<EntityResult<MediaFolder>> Delete(string id);
   }
 }
diff --git a/zero.Core/Api/ModulesApi.cs b/zero.Core/Api/ModulesApi.cs
index 154d0376..8a37f920 100644
--- a/zero.Core/Api/ModulesApi.cs
+++ b/zero.Core/Api/ModulesApi.cs
@@ -27,11 +27,11 @@ namespace zero.Core.Api
     {
       IEnumerable<ModuleType> types = Options.Modules.GetAllItems();
       List<ModuleType> modules = types.ToList();
-      IPage page = null;
+      Page page = null;
 
       if (!pageId.IsNullOrEmpty())
       {
-        page = await GetById<IPage>(pageId);
+        page = await GetById<Page>(pageId);
       }
 
       if (tags?.Length > 0)
diff --git a/zero.Core/Api/PageTreeApi.cs b/zero.Core/Api/PageTreeApi.cs
index f9fe9bf3..ab48ddda 100644
--- a/zero.Core/Api/PageTreeApi.cs
+++ b/zero.Core/Api/PageTreeApi.cs
@@ -29,7 +29,7 @@ namespace zero.Core.Api
       IList<TreeItem> items = new List<TreeItem>();
       IReadOnlyCollection<PageType> pageTypes = Backoffice.Options.Pages.GetAllItems();
       string[] openIds = new string[0] { };
-      IList<IPage> pages = null;
+      IList<Page> pages = null;
       IList<Pages_WithChildren.Result> children = null;
       bool isSearch = !search.IsNullOrWhiteSpace();
 
@@ -39,14 +39,14 @@ namespace zero.Core.Api
       if (isSearch)
       {
         pages = await session
-          .Query<IPage>()
+          .Query<Page>()
           .SearchIf(x => x.Name, search, "*")
           .OrderBy(x => x.Sort, OrderingType.Long)
           .ToListAsync();
 
         var urls = await Routes.GetUrls(pages.ToArray());
         
-        foreach (IPage page in pages)
+        foreach (Page page in pages)
         {
           if (urls.TryGetValue(page, out string url))
           {
@@ -58,7 +58,7 @@ namespace zero.Core.Api
       {
 
         pages = await session
-          .Query<IPage>()
+          .Query<Page>()
           .WhereIf(x => x.ParentId == parentId, !parentId.IsNullOrEmpty(), x => x.ParentId == null)
           .OrderBy(x => x.Sort, OrderingType.Long)
           .ToListAsync();
@@ -90,7 +90,7 @@ namespace zero.Core.Api
 
 
       // function to get modifier icon
-      TreeItemModifier GetModifier(IPage page)
+      TreeItemModifier GetModifier(Page page)
       {
         if (page.PublishDate > DateTimeOffset.Now || page.UnpublishDate > DateTimeOffset.Now)
         {
@@ -105,7 +105,7 @@ namespace zero.Core.Api
 
 
       // build tree
-      foreach (IPage page in pages)
+      foreach (Page page in pages)
       {
         PageType pageType = pageTypes.FirstOrDefault(x => x.Alias == page.PageTypeAlias);
 
diff --git a/zero.Core/Api/PagesApi.cs b/zero.Core/Api/PagesApi.cs
index c6d5ba23..ceeb48d4 100644
--- a/zero.Core/Api/PagesApi.cs
+++ b/zero.Core/Api/PagesApi.cs
@@ -38,18 +38,18 @@ namespace zero.Core.Api
 
 
     /// <inheritdoc />
-    public Task<IPage> GetEmpty(string pageType, string parentId = null)
+    public Task<Page> GetEmpty(string pageType, string parentId = null)
     {
       PageType type = GetPageType(pageType);
 
       if (type == null)
       {
-        return Task.FromResult<IPage>(null);
+        return Task.FromResult<Page>(null);
       }
 
       try
       {
-        IPage model = Activator.CreateInstance(type.ContentType) as IPage;
+        Page model = Activator.CreateInstance(type.ContentType) as Page;
 
         model.PageTypeAlias = type.Alias;
         model.ParentId = parentId; // TODO validate if type is allowed and if parentid is allowed
@@ -61,21 +61,21 @@ namespace zero.Core.Api
         Logger.LogWarning("Could not create page with type {type}", type);
       }
 
-      return Task.FromResult<IPage>(null);
+      return Task.FromResult<Page>(null);
     }
 
 
     /// <inheritdoc />
-    public async Task<IPage> GetById(string id)
+    public async Task<Page> GetById(string id)
     {
-      return await GetById<IPage>(id);
+      return await GetById<Page>(id);
     }
 
 
     /// <inheritdoc />
-    public async Task<Dictionary<string, IPage>> GetByIds(params string[] ids)
+    public async Task<Dictionary<string, Page>> GetByIds(params string[] ids)
     {
-      return await GetByIds<IPage>(ids);
+      return await GetByIds<Page>(ids);
     }
 
 
@@ -90,7 +90,7 @@ namespace zero.Core.Api
     public async Task<IList<PageType>> GetAllowedPageTypes(string parentId = null)
     {    
       IEnumerable<PageType> types = Options.Pages.GetAllItems();
-      List<IPage> parents = new();
+      List<Page> parents = new();
 
       using IAsyncDocumentSession session = Store.OpenAsyncSession();
 
@@ -98,15 +98,15 @@ namespace zero.Core.Api
       {
         Pages_ByHierarchy.Result result = await session.Query<Pages_ByHierarchy.Result, Pages_ByHierarchy>()
           .ProjectInto<Pages_ByHierarchy.Result>()
-          .Include<Pages_ByHierarchy.Result, IPage>(x => x.Id)
-          .Include<Pages_ByHierarchy.Result, IPage>(x => x.Path.Select(p => p.Id))
+          .Include<Pages_ByHierarchy.Result, Page>(x => x.Id)
+          .Include<Pages_ByHierarchy.Result, Page>(x => x.Path.Select(p => p.Id))
           .FirstOrDefaultAsync(x => x.Id == parentId);
 
         if (result != null)
         {
           List<string> ids = result.Path.Select(x => x.Id).ToList();
           ids.Add(result.Id);
-          parents = (await session.LoadAsync<IPage>(ids)).Select(x => x.Value).Reverse().ToList();
+          parents = (await session.LoadAsync<Page>(ids)).Select(x => x.Value).Reverse().ToList();
         }
       }
 
@@ -130,22 +130,22 @@ namespace zero.Core.Api
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<IPage>> Save(IPage model)
+    public async Task<EntityResult<Page>> Save(Page model)
     {
       return await SaveModel(model, null);
     }
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<IList<IPage>>> SaveSorting(string[] sortedIds)
+    public async Task<EntityResult<IList<Page>>> SaveSorting(string[] sortedIds)
     {
-      Dictionary<string, IPage> items = await GetByIds<IPage>(sortedIds);
+      Dictionary<string, Page> items = await GetByIds<Page>(sortedIds);
       uint index = 0;
 
       // contains multiple parents, therefore fail
       if (items.Select(x => x.Value?.ParentId).Distinct().Count() > 1)
       {
-        return EntityResult<IList<IPage>>.Fail("@errors.page.sortingmultipleparents");
+        return EntityResult<IList<Page>>.Fail("@errors.page.sortingmultipleparents");
       }
 
       using (IAsyncDocumentSession session = Store.OpenAsyncSession())
@@ -163,26 +163,26 @@ namespace zero.Core.Api
         await session.SaveChangesAsync();
       }
 
-      return EntityResult<IList<IPage>>.Success(items.Select(x => x.Value).ToList());
+      return EntityResult<IList<Page>>.Success(items.Select(x => x.Value).ToList());
     }
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<IPage>> Move(string id, string parentId)
+    public async Task<EntityResult<Page>> Move(string id, string parentId)
     {
-      IPage model = await GetById<IPage>(id);
-      IPage parent = await GetById<IPage>(parentId);
+      Page model = await GetById<Page>(id);
+      Page parent = await GetById<Page>(parentId);
 
       if (model == null || (!parentId.IsNullOrEmpty() && parent == null))
       {
-        return EntityResult<IPage>.Fail("@errors.idnotfound");
+        return EntityResult<Page>.Fail("@errors.idnotfound");
       }
 
       IList<PageType> pageTypes = await GetAllowedPageTypes(parentId);
 
       if (!pageTypes.Any(x => x.Alias == model.PageTypeAlias))
       {
-        return EntityResult<IPage>.Fail("@errors.page.parentnotallowed");
+        return EntityResult<Page>.Fail("@errors.page.parentnotallowed");
       }
 
       model.ParentId = parent?.Id;
@@ -192,14 +192,14 @@ namespace zero.Core.Api
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<IPage>> Copy(string id, string destinationId, bool includeDescendants = false)
+    public async Task<EntityResult<Page>> Copy(string id, string destinationId, bool includeDescendants = false)
     {
-      IPage model = await GetById<IPage>(id);
-      IPage parent = await GetById<IPage>(destinationId);
+      Page model = await GetById<Page>(id);
+      Page parent = await GetById<Page>(destinationId);
 
       if (model == null || (!destinationId.IsNullOrEmpty() && parent == null))
       {
-        return EntityResult<IPage>.Fail("@errors.idnotfound");
+        return EntityResult<Page>.Fail("@errors.idnotfound");
       }
 
       string baseId = model.Id;
@@ -215,7 +215,7 @@ namespace zero.Core.Api
 
       if (!pageTypes.Any(x => x.Alias == model.PageTypeAlias))
       {
-        return EntityResult<IPage>.Fail("@errors.page.parentnotallowed");
+        return EntityResult<Page>.Fail("@errors.page.parentnotallowed");
       }
 
       using (IAsyncDocumentSession session = Store.OpenAsyncSession())
@@ -227,7 +227,7 @@ namespace zero.Core.Api
         {
           Pages_WithChildren.Result childrenResult = await session.Query<Pages_WithChildren.Result, Pages_WithChildren>()
             .ProjectInto<Pages_WithChildren.Result>()
-            .Include<Pages_WithChildren.Result, IPage>(x => x.Id)
+            .Include<Pages_WithChildren.Result, Page>(x => x.Id)
             .Where(x => x.Id == oldParentId)
             .FirstOrDefaultAsync();
 
@@ -236,11 +236,11 @@ namespace zero.Core.Api
             return;
           }
 
-          Dictionary<string, IPage> childrenPages = await session.LoadAsync<IPage>(childrenResult.ChildrenIds);
+          Dictionary<string, Page> childrenPages = await session.LoadAsync<Page>(childrenResult.ChildrenIds);
 
           foreach (var child in childrenPages)
           {
-            IPage childPage = child.Value.Clone();
+            Page childPage = child.Value.Clone();
             childPage.Id = null;
             childPage.IsActive = false;
             childPage.ParentId = newParentId;
@@ -261,14 +261,14 @@ namespace zero.Core.Api
         await session.SaveChangesAsync();
       }
 
-      return EntityResult<IPage>.Success(model);
+      return EntityResult<Page>.Success(model);
     }
 
 
     /// <inheritdoc />
     public async Task<EntityResult<string[]>> Delete(string id, bool moveToRecycleBin = true)
     {
-      IList<IPage> pages = await GetByIdWithDescendants(id);
+      IList<Page> pages = await GetByIdWithDescendants(id);
       string[] ids = pages.Select(x => x.Id).ToArray();
 
       if (pages.Count < 1)
@@ -281,7 +281,7 @@ namespace zero.Core.Api
         await RecycleBinApi.Add(pages, RECYCLE_BIN_GROUP);
       }
 
-      await DeleteByIds<IPage>(ids);
+      await DeleteByIds<Page>(ids);
 
       return EntityResult<string[]>.Success(ids);
     }
@@ -291,8 +291,8 @@ namespace zero.Core.Api
     public async Task<EntityResult<string[]>> Restore(string id, bool includeDescendants = false)
     {
       EntityResult<string[]> result = new EntityResult<string[]>();
-      IRecycledEntity recycledEntity = await RecycleBinApi.GetById(id);
-      List<IRecycledEntity> entities = new List<IRecycledEntity>() { recycledEntity };
+      RecycledEntity recycledEntity = await RecycleBinApi.GetById(id);
+      List<RecycledEntity> entities = new List<RecycledEntity>() { recycledEntity };
 
       if (recycledEntity == null)
       {
@@ -309,21 +309,21 @@ namespace zero.Core.Api
       string[] ids = entities.Select(x => x.OriginalId).ToArray();
 
       // check if parents are available
-      string[] parentIds = entities.Select(x => x.Content as IPage).Where(x => x != null).Select(x => x.ParentId).ToArray();
-      parentIds = (await GetByIds<IPage>(parentIds)).Where(x => x.Value != null).Select(x => x.Value.Id).ToArray();
+      string[] parentIds = entities.Select(x => x.Content as Page).Where(x => x != null).Select(x => x.ParentId).ToArray();
+      parentIds = (await GetByIds<Page>(parentIds)).Where(x => x.Value != null).Select(x => x.Value.Id).ToArray();
 
       // validate and restore all items
-      foreach (IRecycledEntity entity in entities)
+      foreach (RecycledEntity entity in entities)
       {
         // check if it contains page data
-        if (entity.Group != RECYCLE_BIN_GROUP || !(entity.Content is IPage))
+        if (entity.Group != RECYCLE_BIN_GROUP || !(entity.Content is Page))
         {
-          //result.AddError("Cannot parse recycled entity as an IPage in group \"" + RECYCLE_BIN_GROUP + "\""); // TODO correct error message
+          //result.AddError("Cannot parse recycled entity as an Page in group \"" + RECYCLE_BIN_GROUP + "\""); // TODO correct error message
           continue;
         }
 
         // get page
-        IPage page = entity.Content as IPage;
+        Page page = entity.Content as Page;
         page.IsActive = false;
 
         // validate app and parent
@@ -334,7 +334,7 @@ namespace zero.Core.Api
         }
 
         // restore to pages
-        EntityResult<IPage> saveResult = await SaveModel(page);
+        EntityResult<Page> saveResult = await SaveModel(page);
       }
 
       // delete affected entities from recycle bin
@@ -354,11 +354,11 @@ namespace zero.Core.Api
     /// <summary>
     /// Get a page with all its descendants
     /// </summary>
-    async Task<List<IPage>> GetByIdWithDescendants(string id)
+    async Task<List<Page>> GetByIdWithDescendants(string id)
     {
-      List<IPage> items = new List<IPage>();
+      List<Page> items = new List<Page>();
 
-      IPage model = await GetById<IPage>(id);
+      Page model = await GetById<Page>(id);
 
       if (model == null)
       {
@@ -374,7 +374,7 @@ namespace zero.Core.Api
         {
           Pages_WithChildren.Result childrenResult = await session.Query<Pages_WithChildren.Result, Pages_WithChildren>()
             .ProjectInto<Pages_WithChildren.Result>()
-            .Include<Pages_WithChildren.Result, IPage>(x => x.Id)
+            .Include<Pages_WithChildren.Result, Page>(x => x.Id)
             .Where(x => x.Id == parentId)
             .FirstOrDefaultAsync();
 
@@ -383,7 +383,7 @@ namespace zero.Core.Api
             return;
           }
 
-          Dictionary<string, IPage> childrenPages = await session.LoadAsync<IPage>(childrenResult.ChildrenIds);
+          Dictionary<string, Page> childrenPages = await session.LoadAsync<Page>(childrenResult.ChildrenIds);
 
           foreach (var child in childrenPages)
           {
@@ -405,17 +405,17 @@ namespace zero.Core.Api
     /// <summary>
     /// Get a new empty page with the specified type
     /// </summary>
-    public Task<IPage> GetEmpty(string pageType, string parentId = null);
+    public Task<Page> GetEmpty(string pageType, string parentId = null);
 
     /// <summary>
     /// Get page by Id
     /// </summary>
-    Task<IPage> GetById(string id);
+    Task<Page> GetById(string id);
 
     /// <summary>
     /// Get pages by ids
     /// </summary>
-    Task<Dictionary<string, IPage>> GetByIds(params string[] ids);
+    Task<Dictionary<string, Page>> GetByIds(params string[] ids);
 
     /// <summary>
     /// Get all available page types
@@ -435,22 +435,22 @@ namespace zero.Core.Api
     /// <summary>
     /// Creates or updates a page
     /// </summary>
-    Task<EntityResult<IPage>> Save(IPage model);
+    Task<EntityResult<Page>> Save(Page model);
 
     /// <summary>
     /// Update sorting of pages on a specific level
     /// </summary>
-    Task<EntityResult<IList<IPage>>> SaveSorting(string[] sortedIds);
+    Task<EntityResult<IList<Page>>> SaveSorting(string[] sortedIds);
 
     /// <summary>
     /// Move a page to a new parent
     /// </summary>
-    Task<EntityResult<IPage>> Move(string id, string parentId);
+    Task<EntityResult<Page>> Move(string id, string parentId);
 
     /// <summary>
     /// Copies a page (with optional descendants) to a new location
     /// </summary>
-    Task<EntityResult<IPage>> Copy(string id, string destinationId, bool includeDescendants = false);
+    Task<EntityResult<Page>> Copy(string id, string destinationId, bool includeDescendants = false);
 
     /// <summary>
     /// Deletes a page by Id (with all it's descendants)
diff --git a/zero.Core/Api/PreviewApi.cs b/zero.Core/Api/PreviewApi.cs
index 8f33671d..b48a5017 100644
--- a/zero.Core/Api/PreviewApi.cs
+++ b/zero.Core/Api/PreviewApi.cs
@@ -8,25 +8,25 @@ namespace zero.Core.Api
 {
   public class PreviewApi : BackofficeApi, IPreviewApi
   {
-    IPreview Blueprint;
+    Preview Blueprint;
 
-    public PreviewApi(IBackofficeStore store, IPreview blueprint) : base(store)
+    public PreviewApi(IBackofficeStore store, Preview blueprint) : base(store)
     {
       Blueprint = blueprint;
     }
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<IPreview>> Add<TEntity>(TEntity model) where TEntity : IZeroEntity
+    public async Task<EntityResult<Preview>> Add<TEntity>(TEntity model) where TEntity : ZeroEntity
     {
       return await Update(null, model);
     }
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<IPreview>> Update<TEntity>(string id, TEntity model) where TEntity : IZeroEntity
+    public async Task<EntityResult<Preview>> Update<TEntity>(string id, TEntity model) where TEntity : ZeroEntity
     {
-      IPreview entity = id == null ? await GetById<IPreview>(id) : Blueprint.Clone();
+      Preview entity = id == null ? await GetById<Preview>(id) : Blueprint.Clone();
       entity.Content = model;
       entity.OriginalId = model.Id;
       entity.Name = model.Name;
@@ -39,16 +39,16 @@ namespace zero.Core.Api
 
 
     /// <inheritdoc />
-    public async Task<IPreview> GetById(string id)
+    public async Task<Preview> GetById(string id)
     {
-      return await GetById<IPreview>(id);
+      return await GetById<Preview>(id);
     }
 
 
     /// <summary>
     /// Get preview expiration for a document
     /// </summary>
-    DateTime GetExpiry(IZeroEntity model)
+    DateTime GetExpiry(ZeroEntity model)
     {
       return DateTime.Now.AddHours(1);
     }
@@ -59,16 +59,16 @@ namespace zero.Core.Api
     /// <summary>
     /// Adds an entity to the preview collection. This will generate a preview with an id which can be used for the preview view.
     /// </summary>
-    Task<EntityResult<IPreview>> Add<TEntity>(TEntity model) where TEntity : IZeroEntity;
+    Task<EntityResult<Preview>> Add<TEntity>(TEntity model) where TEntity : ZeroEntity;
 
     /// <summary>
     /// Updates an entity in the preview collection. This will generate a preview with an id which can be used for the preview view.
     /// </summary>
-    Task<EntityResult<IPreview>> Update<TEntity>(string id, TEntity model) where TEntity : IZeroEntity;
+    Task<EntityResult<Preview>> Update<TEntity>(string id, TEntity model) where TEntity : ZeroEntity;
 
     /// <summary>
     /// Get preview entity by Id
     /// </summary>
-    Task<IPreview> GetById(string id);
+    Task<Preview> GetById(string id);
   }
 }
diff --git a/zero.Core/Api/RecycleBinApi.cs b/zero.Core/Api/RecycleBinApi.cs
index 73fb42e5..90784579 100644
--- a/zero.Core/Api/RecycleBinApi.cs
+++ b/zero.Core/Api/RecycleBinApi.cs
@@ -11,18 +11,18 @@ namespace zero.Core.Api
 {
   public class RecycleBinApi : BackofficeApi, IRecycleBinApi
   {
-    IRecycledEntity Blueprint;
+    RecycledEntity Blueprint;
 
-    public RecycleBinApi(IBackofficeStore store, IRecycledEntity blueprint) : base(store)
+    public RecycleBinApi(IBackofficeStore store, RecycledEntity blueprint) : base(store)
     {
       Blueprint = blueprint;
     }
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<IRecycledEntity>> Add<TEntity>(TEntity model, string group = null, string operationId = null) where TEntity : IZeroEntity
+    public async Task<EntityResult<RecycledEntity>> Add<TEntity>(TEntity model, string group = null, string operationId = null) where TEntity : ZeroEntity
     {
-      IRecycledEntity entity = Blueprint.Clone();
+      RecycledEntity entity = Blueprint.Clone();
       entity.Group = group;
       entity.Content = model;
       entity.OriginalId = model.Id;
@@ -34,42 +34,42 @@ namespace zero.Core.Api
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<IEnumerable<IRecycledEntity>>> Add<TEntity>(IEnumerable<TEntity> models, string group = null) where TEntity : IZeroEntity
+    public async Task<EntityResult<IEnumerable<RecycledEntity>>> Add<TEntity>(IEnumerable<TEntity> models, string group = null) where TEntity : ZeroEntity
     {
-      IList<IRecycledEntity> results = new List<IRecycledEntity>();
+      IList<RecycledEntity> results = new List<RecycledEntity>();
       string operationId = IdGenerator.Create();
 
       foreach (TEntity model in models)
       {
-        EntityResult<IRecycledEntity> result = await Add(model, group, operationId);
+        EntityResult<RecycledEntity> result = await Add(model, group, operationId);
 
         if (!result.IsSuccess)
         {
-          return EntityResult<IEnumerable<IRecycledEntity>>.Fail(result.Errors);
+          return EntityResult<IEnumerable<RecycledEntity>>.Fail(result.Errors);
         }
 
         results.Add(result.Model);
       }
 
-      return EntityResult<IEnumerable<IRecycledEntity>>.Success(results);
+      return EntityResult<IEnumerable<RecycledEntity>>.Success(results);
     }
 
 
     /// <inheritdoc />
-    public async Task<IRecycledEntity> GetById(string id)
+    public async Task<RecycledEntity> GetById(string id)
     {
-      return await GetById<IRecycledEntity>(id);
+      return await GetById<RecycledEntity>(id);
     }
 
 
     /// <inheritdoc />
-    public async Task<ListResult<IRecycledEntity>> GetByQuery(RecycleBinListQuery query)
+    public async Task<ListResult<RecycledEntity>> GetByQuery(RecycleBinListQuery query)
     {
       query.SearchSelector = x => x.Name;
 
       using (IAsyncDocumentSession session = Store.OpenAsyncSession())
       {
-        return await session.Query<IRecycledEntity>()
+        return await session.Query<RecycledEntity>()
           .WhereIf(x => x.Group == query.Group, !query.Group.IsNullOrWhiteSpace())
           .WhereIf(x => x.OperationId == query.OperationId, !query.OperationId.IsNullOrWhiteSpace())
           .ToQueriedListAsync(query);
@@ -78,11 +78,11 @@ namespace zero.Core.Api
 
 
     /// <inheritdoc />
-    public async Task<IList<IRecycledEntity>> GetByOperation(string operationId)
+    public async Task<IList<RecycledEntity>> GetByOperation(string operationId)
     {
       using (IAsyncDocumentSession session = Store.OpenAsyncSession())
       {
-        return await session.Query<IRecycledEntity>()
+        return await session.Query<RecycledEntity>()
           .Where(x => x.OperationId == operationId)
           .ToListAsync();
       }
@@ -96,7 +96,7 @@ namespace zero.Core.Api
     {
       using (IAsyncDocumentSession session = Store.OpenAsyncSession())
       {
-        return await session.Query<IRecycledEntity>()
+        return await session.Query<RecycledEntity>()
           .Where(x => x.OperationId == operationId)
           .CountAsync();
       }
@@ -104,31 +104,31 @@ namespace zero.Core.Api
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<IRecycledEntity>> Delete(string id)
+    public async Task<EntityResult<RecycledEntity>> Delete(string id)
     {
-      return await DeleteById<IRecycledEntity>(id);
+      return await DeleteById<RecycledEntity>(id);
     }
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<IRecycledEntity>> DeleteAll()
+    public async Task<EntityResult<RecycledEntity>> DeleteAll()
     {
       // TODO make Purge operations app-aware
-      return await Purge<IRecycledEntity>();
+      return await Purge<RecycledEntity>();
     }
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<IRecycledEntity>> DeleteByOperation(string operationId)
+    public async Task<EntityResult<RecycledEntity>> DeleteByOperation(string operationId)
     {
-      return await Purge<IRecycledEntity>("where c.OperationId = $id", new Raven.Client.Parameters() { { "id", operationId } });
+      return await Purge<RecycledEntity>("where c.OperationId = $id", new Raven.Client.Parameters() { { "id", operationId } });
     }
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<IRecycledEntity>> DeleteByGroup(string group)
+    public async Task<EntityResult<RecycledEntity>> DeleteByGroup(string group)
     {
-      return await Purge<IRecycledEntity>("where c.Group = $group", new Raven.Client.Parameters() { { "group", group } });
+      return await Purge<RecycledEntity>("where c.Group = $group", new Raven.Client.Parameters() { { "group", group } });
     }
   }
 
@@ -137,27 +137,27 @@ namespace zero.Core.Api
     /// <summary>
     /// Adds an entity to the recycle bin. This operation will not remove this entity from it's own collection!
     /// </summary>
-    Task<EntityResult<IRecycledEntity>> Add<TEntity>(TEntity model, string group = null, string operationId = null) where TEntity : IZeroEntity;
+    Task<EntityResult<RecycledEntity>> Add<TEntity>(TEntity model, string group = null, string operationId = null) where TEntity : ZeroEntity;
 
     /// <summary>
     /// Adds the specified entities to the recycle bin. This operation will not remove entities from their own collection!
     /// </summary>
-    Task<EntityResult<IEnumerable<IRecycledEntity>>> Add<TEntity>(IEnumerable<TEntity> models, string group = null) where TEntity : IZeroEntity;
+    Task<EntityResult<IEnumerable<RecycledEntity>>> Add<TEntity>(IEnumerable<TEntity> models, string group = null) where TEntity : ZeroEntity;
 
     /// <summary>
     /// Get recycled entity by Id
     /// </summary>
-    Task<IRecycledEntity> GetById(string id);
+    Task<RecycledEntity> GetById(string id);
 
     /// <summary>
     /// Get all recycled items
     /// </summary>
-    Task<ListResult<IRecycledEntity>> GetByQuery(RecycleBinListQuery query);
+    Task<ListResult<RecycledEntity>> GetByQuery(RecycleBinListQuery query);
 
     /// <summary>
     /// Get affected entities from a specific operation
     /// </summary>
-    Task<IList<IRecycledEntity>> GetByOperation(string operationId);
+    Task<IList<RecycledEntity>> GetByOperation(string operationId);
 
     /// <summary>
     /// Get affected entity count from a specific operation
@@ -167,21 +167,21 @@ namespace zero.Core.Api
     // <summary>
     /// Deletes a recycled entity by Id
     /// </summary>
-    Task<EntityResult<IRecycledEntity>> Delete(string id);
+    Task<EntityResult<RecycledEntity>> Delete(string id);
 
     /// <summary>
     /// Purges the recycle bin
     /// </summary>
-    Task<EntityResult<IRecycledEntity>> DeleteAll();
+    Task<EntityResult<RecycledEntity>> DeleteAll();
 
     /// <summary>
     /// Deletes all recycled items from a specific operation
     /// </summary>
-    Task<EntityResult<IRecycledEntity>> DeleteByOperation(string operationId);
+    Task<EntityResult<RecycledEntity>> DeleteByOperation(string operationId);
 
     /// <summary>
     /// Deletes all recycled items from a specific group
     /// </summary>
-    Task<EntityResult<IRecycledEntity>> DeleteByGroup(string group);
+    Task<EntityResult<RecycledEntity>> DeleteByGroup(string group);
   }
 }
diff --git a/zero.Core/Api/RevisionsApi.cs b/zero.Core/Api/RevisionsApi.cs
index 1ddaab3d..05bd0cc1 100644
--- a/zero.Core/Api/RevisionsApi.cs
+++ b/zero.Core/Api/RevisionsApi.cs
@@ -35,7 +35,7 @@ namespace zero.Core.Api
     /// <summary>
     /// Get revision list for an entity
     /// </summary>
-    public async Task<ListResult<Revision>> GetPaged<T>(string id, int pageNumber = 1, int pageSize = 10, bool includeContent = false) where T : IZeroEntity
+    public async Task<ListResult<Revision>> GetPaged<T>(string id, int pageNumber = 1, int pageSize = 10, bool includeContent = false) where T : ZeroEntity
     {
       using IAsyncDocumentSession session = Store.OpenAsyncSession();
 
@@ -65,7 +65,7 @@ namespace zero.Core.Api
 
       // load affected users as the revisions could have been edited by other users too
       string[] userIds = items.Select(x => x.LastModifiedById).Distinct().ToArray();
-      Dictionary<string, IBackofficeUser> users = await UserApi.GetByIds(userIds);
+      Dictionary<string, BackofficeUser> users = await UserApi.GetByIds(userIds);
 
       // create revision objects
       foreach (T item in items)
@@ -77,7 +77,7 @@ namespace zero.Core.Api
           Json = includeContent ? JsonConvert.SerializeObject(item) : null
         };
 
-        if (!item.LastModifiedById.IsNullOrEmpty() && users.TryGetValue(item.LastModifiedById, out IBackofficeUser user) && user != null)
+        if (!item.LastModifiedById.IsNullOrEmpty() && users.TryGetValue(item.LastModifiedById, out BackofficeUser user) && user != null)
         {
           revision.User = new RevisionUser()
           {
@@ -100,6 +100,6 @@ namespace zero.Core.Api
     /// <summary>
     /// Get revision list (without content JSON) for an entity
     /// </summary>
-    Task<ListResult<Revision>> GetPaged<T>(string id, int pageNumber = 1, int pageSize = 10, bool includeContent = false) where T : IZeroEntity;
+    Task<ListResult<Revision>> GetPaged<T>(string id, int pageNumber = 1, int pageSize = 10, bool includeContent = false) where T : ZeroEntity;
   }
 }
diff --git a/zero.Core/Api/SetupApi.cs b/zero.Core/Api/SetupApi.cs
index ee3feac1..7b29bbbe 100644
--- a/zero.Core/Api/SetupApi.cs
+++ b/zero.Core/Api/SetupApi.cs
@@ -246,7 +246,7 @@ namespace zero.Core.Api
         Icon = "fth-award",
         CreatedDate = DateTimeOffset.Now,
         IsActive = true,
-        Claims = new List<IUserClaim>()
+        Claims = new List<UserClaim>()
         {
           //new UserClaim(type, Permissions.Applications, PermissionsValue.Write),
           new UserClaim(type, Permissions.Sections.Dashboard, PermissionsValue.True),
@@ -271,7 +271,7 @@ namespace zero.Core.Api
         Icon = "fth-feather",
         CreatedDate = DateTimeOffset.Now,
         IsActive = true,
-        Claims = new List<IUserClaim>()
+        Claims = new List<UserClaim>()
         {
           new UserClaim(type, Permissions.Sections.Dashboard, PermissionsValue.True),
           new UserClaim(type, Permissions.Sections.Spaces, PermissionsValue.True),
@@ -290,7 +290,7 @@ namespace zero.Core.Api
         Icon = "fth-users",
         CreatedDate = DateTimeOffset.Now,
         IsActive = true,
-        Claims = new List<IUserClaim>()
+        Claims = new List<UserClaim>()
         {
           new UserClaim(type, Permissions.Sections.Dashboard, PermissionsValue.True)
         }
@@ -300,9 +300,9 @@ namespace zero.Core.Api
     }
 
 
-    T Prepare<T>(T model, string languageId = null) where T : IZeroIdEntity
+    T Prepare<T>(T model, string languageId = null) where T : ZeroIdEntity
     {
-      IZeroEntity zeroEntity = model as IZeroEntity;
+      ZeroEntity zeroEntity = model as ZeroEntity;
 
       // set default properties
       if (zeroEntity != null && zeroEntity.CreatedDate == default)
@@ -313,10 +313,9 @@ namespace zero.Core.Api
       {
         zeroEntity.CreatedById = Constants.Auth.SystemUser;
       }
-
-      if (model is ILanguageAwareEntity && (model as ILanguageAwareEntity).LanguageId == null)
+      if (zeroEntity != null && zeroEntity.LanguageId == default)
       {
-        (model as ILanguageAwareEntity).LanguageId = languageId;
+        zeroEntity.LanguageId = languageId;
       }
 
       // update name alias and last modified
diff --git a/zero.Core/Api/SpacesApi.cs b/zero.Core/Api/SpacesApi.cs
index df6068d5..9dcbeb53 100644
--- a/zero.Core/Api/SpacesApi.cs
+++ b/zero.Core/Api/SpacesApi.cs
@@ -29,7 +29,7 @@ namespace zero.Core.Api
 
 
     /// <inheritdoc />
-    public Space GetBy<T>() where T : ISpaceContent
+    public Space GetBy<T>() where T : SpaceContent
     {
       Type type = typeof(T);
       return GetAll().FirstOrDefault(x => x.Type == type);
@@ -44,13 +44,13 @@ namespace zero.Core.Api
 
 
     /// <inheritdoc />
-    public async Task<ISpaceContent> GetItem(string alias, string id = null)
+    public async Task<SpaceContent> GetItem(string alias, string id = null)
     {
       Space space = GetByAlias(alias);
 
       using (IAsyncDocumentSession session = Store.OpenAsyncSession())
       {
-        return await session.Query<ISpaceContent>()
+        return await session.Query<SpaceContent>()
           .Where(x => x.SpaceAlias == space.Alias)
           .WhereIf(x => x.Id == id, !id.IsNullOrEmpty())
           .FirstOrDefaultAsync();
@@ -59,7 +59,7 @@ namespace zero.Core.Api
 
 
     /// <inheritdoc />
-    public async Task<T> GetItem<T>(string id = null) where T : ISpaceContent
+    public async Task<T> GetItem<T>(string id = null) where T : SpaceContent
     {
       Space space = GetBy<T>();
 
@@ -74,13 +74,13 @@ namespace zero.Core.Api
 
 
     /// <inheritdoc />
-    public async Task<ListResult<ISpaceContent>> GetListByQuery(string alias, ListQuery<ISpaceContent> query)
+    public async Task<ListResult<SpaceContent>> GetListByQuery(string alias, ListQuery<SpaceContent> query)
     {
       query.SearchSelector = item => item.Name;
 
       using (IAsyncDocumentSession session = Store.OpenAsyncSession())
       {
-        return await session.Query<ISpaceContent>()
+        return await session.Query<SpaceContent>()
           .Where(x => x.SpaceAlias == alias)
           .ToQueriedListAsync(query);
       }
@@ -88,7 +88,7 @@ namespace zero.Core.Api
 
 
     /// <inheritdoc />
-    public async Task<ListResult<T>> GetListByQuery<T>(string alias, ListQuery<T> query) where T : ISpaceContent
+    public async Task<ListResult<T>> GetListByQuery<T>(string alias, ListQuery<T> query) where T : SpaceContent
     {
       query.SearchSelector = item => item.Name;
 
@@ -102,7 +102,7 @@ namespace zero.Core.Api
 
 
     /// <inheritdoc />
-    public async Task<ListResult<T>> GetListByQuery<T>(ListQuery<T> query) where T : ISpaceContent
+    public async Task<ListResult<T>> GetListByQuery<T>(ListQuery<T> query) where T : SpaceContent
     {
       Space space = GetBy<T>();
       query.SearchSelector = item => item.Name;
@@ -117,16 +117,16 @@ namespace zero.Core.Api
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<ISpaceContent>> Save(ISpaceContent model)
+    public async Task<EntityResult<SpaceContent>> Save(SpaceContent model)
     {
       return await SaveModel(model, null);
     }
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<ISpaceContent>> Delete(string id)
+    public async Task<EntityResult<SpaceContent>> Delete(string id)
     {
-      return await DeleteById<ISpaceContent>(id);
+      return await DeleteById<SpaceContent>(id);
     }
   }
 
@@ -141,7 +141,7 @@ namespace zero.Core.Api
     /// <summary>
     /// Returns a space by a defined generic
     /// </summary>
-    Space GetBy<T>() where T : ISpaceContent;
+    Space GetBy<T>() where T : SpaceContent;
 
     /// <summary>
     /// Get all spaces
@@ -151,36 +151,36 @@ namespace zero.Core.Api
     /// <summary>
     /// Get editor item for a space
     /// </summary>
-    Task<ISpaceContent> GetItem(string alias, string id = null);
+    Task<SpaceContent> GetItem(string alias, string id = null);
 
     /// <summary>
     /// Get editor item for a space
     /// </summary>
-    Task<T> GetItem<T>(string id = null) where T : ISpaceContent;
+    Task<T> GetItem<T>(string id = null) where T : SpaceContent;
 
     /// <summary>
     /// Get all list items for a space (with query)
     /// </summary>
-    Task<ListResult<ISpaceContent>> GetListByQuery(string alias, ListQuery<ISpaceContent> query);
+    Task<ListResult<SpaceContent>> GetListByQuery(string alias, ListQuery<SpaceContent> query);
 
     /// <summary>
     /// Get all list items for a space (with query)
     /// </summary>
-    Task<ListResult<T>> GetListByQuery<T>(string alias, ListQuery<T> query) where T : ISpaceContent;
+    Task<ListResult<T>> GetListByQuery<T>(string alias, ListQuery<T> query) where T : SpaceContent;
 
     /// <summary>
     /// Get all list items for a space (with query)
     /// </summary>
-    Task<ListResult<T>> GetListByQuery<T>(ListQuery<T> query) where T : ISpaceContent;
+    Task<ListResult<T>> GetListByQuery<T>(ListQuery<T> query) where T : SpaceContent;
 
     /// <summary>
     /// Saves a content item in a space
     /// </summary>
-    Task<EntityResult<ISpaceContent>> Save(ISpaceContent model);
+    Task<EntityResult<SpaceContent>> Save(SpaceContent model);
 
     /// <summary>
     /// Deletes a space content item
     /// </summary>
-    Task<EntityResult<ISpaceContent>> Delete(string id);
+    Task<EntityResult<SpaceContent>> Delete(string id);
   }
 }
diff --git a/zero.Core/Api/Token.cs b/zero.Core/Api/Token.cs
index a72299d2..210372a3 100644
--- a/zero.Core/Api/Token.cs
+++ b/zero.Core/Api/Token.cs
@@ -27,7 +27,7 @@ namespace zero.Core.Api
 
 
     /// <inheritdoc />
-    public bool Verify(IZeroIdEntity entity, string token)
+    public bool Verify(ZeroIdEntity entity, string token)
     {
       return Verify(entity?.Id, token);
     }
@@ -54,7 +54,7 @@ namespace zero.Core.Api
 
 
     /// <inheritdoc />
-    public string Get(IZeroIdEntity entity)
+    public string Get(ZeroIdEntity entity)
     {
       return Get(entity?.Id);
     }
@@ -91,7 +91,7 @@ namespace zero.Core.Api
     /// <summary>
     /// Verifies if the change token is valid for the entity
     /// </summary>
-    bool Verify(IZeroIdEntity entity, string token);
+    bool Verify(ZeroIdEntity entity, string token);
 
     /// <summary>
     /// Verifies if the change token is valid for the entity
@@ -101,7 +101,7 @@ namespace zero.Core.Api
     /// <summary>
     /// Get a new change token for the entity
     /// </summary>
-    string Get(IZeroIdEntity entity);
+    string Get(ZeroIdEntity entity);
 
     /// <summary>
     /// Get a new change token for the entity
diff --git a/zero.Core/Api/UserApi.cs b/zero.Core/Api/UserApi.cs
index 8eb59bb1..e50592e1 100644
--- a/zero.Core/Api/UserApi.cs
+++ b/zero.Core/Api/UserApi.cs
@@ -24,83 +24,83 @@ namespace zero.Core.Api
 
 
     /// <inheritdoc />
-    public async Task<IBackofficeUser> GetUserById(string id)
+    public async Task<BackofficeUser> GetUserById(string id)
     {
-      IBackofficeUser user = await UserManager.FindByIdAsync(id);
+      BackofficeUser user = await UserManager.FindByIdAsync(id);
       return user;
     }
 
 
     /// <inheritdoc />
-    public async Task<IBackofficeUser> GetUserByEmail(string email)
+    public async Task<BackofficeUser> GetUserByEmail(string email)
     {
-      IBackofficeUser user = await UserManager.FindByEmailAsync(email);
+      BackofficeUser user = await UserManager.FindByEmailAsync(email);
       return user;
     }
 
 
     /// <inheritdoc />
-    public async Task<Dictionary<string, IBackofficeUser>> GetByIds(params string[] ids)
+    public async Task<Dictionary<string, BackofficeUser>> GetByIds(params string[] ids)
     {
-      return await GetByIds<IBackofficeUser>(ids);
+      return await GetByIds<BackofficeUser>(ids);
     }
 
 
     /// <inheritdoc />
-    public async Task<IList<IBackofficeUser>> GetAll()
+    public async Task<IList<BackofficeUser>> GetAll()
     {
       using IAsyncDocumentSession session = Session();
-      return await session.Query<IBackofficeUser>()
+      return await session.Query<BackofficeUser>()
         .OrderByDescending(x => x.CreatedDate)
         .ToListAsync();
     }
 
 
     /// <inheritdoc />
-    public async Task<ListResult<IBackofficeUser>> GetByQuery(ListQuery<IBackofficeUser> query)
+    public async Task<ListResult<BackofficeUser>> GetByQuery(ListQuery<BackofficeUser> query)
     {
       string currentUserId = UserManager.GetUserId(Context.BackofficeUser);
 
       query.SearchSelector = user => user.Name;
 
       using IAsyncDocumentSession session = Session();
-      return await session.Query<IBackofficeUser>()
+      return await session.Query<BackofficeUser>()
         .ToQueriedListAsync(query);
     }
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<IBackofficeUser>> Save(IBackofficeUser model)
+    public async Task<EntityResult<BackofficeUser>> Save(BackofficeUser model)
     {
       return await SaveModel(model); //, new UserValidator<User>());
     }
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<IBackofficeUser>> Delete(string id)
+    public async Task<EntityResult<BackofficeUser>> Delete(string id)
     {
-      return await DeleteById<IBackofficeUser>(id);
+      return await DeleteById<BackofficeUser>(id);
     }
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<IBackofficeUser>> UpdatePassword(IBackofficeUser user, string currentPassword, string newPassword)
+    public async Task<EntityResult<BackofficeUser>> UpdatePassword(BackofficeUser user, string currentPassword, string newPassword)
     {
       if (currentPassword.IsNullOrWhiteSpace() || newPassword.IsNullOrWhiteSpace())
       {
-        return EntityResult<IBackofficeUser>.Fail(nameof(currentPassword), "@errors.changepassword.emptyfields");
+        return EntityResult<BackofficeUser>.Fail(nameof(currentPassword), "@errors.changepassword.emptyfields");
       }
 
       if (user == null)
       {
-        return EntityResult<IBackofficeUser>.Fail("@errors.changepassword.nouser");
+        return EntityResult<BackofficeUser>.Fail("@errors.changepassword.nouser");
       }
 
       IdentityResult identityResult = await UserManager.ChangePasswordAsync(user as BackofficeUser, currentPassword, newPassword);
 
       if (!identityResult.Succeeded)
       {
-        EntityResult<IBackofficeUser> result = EntityResult<IBackofficeUser>.Fail();
+        EntityResult<BackofficeUser> result = EntityResult<BackofficeUser>.Fail();
         
         foreach (IdentityError error in identityResult.Errors)
         {
@@ -110,19 +110,19 @@ namespace zero.Core.Api
         return result;
       }
 
-      return EntityResult<IBackofficeUser>.Success(user);
+      return EntityResult<BackofficeUser>.Success(user);
     }
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<IBackofficeUser>> Enable(IBackofficeUser user)
+    public async Task<EntityResult<BackofficeUser>> Enable(BackofficeUser user)
     {
       return await UpdateActiveState(user, true);
     }
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<IBackofficeUser>> Disable(IBackofficeUser user)
+    public async Task<EntityResult<BackofficeUser>> Disable(BackofficeUser user)
     {
       return await UpdateActiveState(user, false);
     }
@@ -132,7 +132,7 @@ namespace zero.Core.Api
     /// Updates the active state of user.
     /// If IsActive=false, the user cannot login anymore
     /// </summary>
-    async Task<EntityResult<IBackofficeUser>> UpdateActiveState(IBackofficeUser user, bool isActive)
+    async Task<EntityResult<BackofficeUser>> UpdateActiveState(BackofficeUser user, bool isActive)
     {
       user.IsActive = isActive;
 
@@ -140,7 +140,7 @@ namespace zero.Core.Api
 
       if (!identityResult.Succeeded)
       {
-        EntityResult<IBackofficeUser> result = EntityResult<IBackofficeUser>.Fail();
+        EntityResult<BackofficeUser> result = EntityResult<BackofficeUser>.Fail();
 
         foreach (IdentityError error in identityResult.Errors)
         {
@@ -152,7 +152,7 @@ namespace zero.Core.Api
 
       await UserManager.UpdateSecurityStampAsync(user as BackofficeUser);
 
-      return EntityResult<IBackofficeUser>.Success(user);
+      return EntityResult<BackofficeUser>.Success(user);
     }
   }
 
@@ -162,52 +162,52 @@ namespace zero.Core.Api
     /// <summary>
     /// Find user by id
     /// </summary>
-    Task<IBackofficeUser> GetUserById(string id);
+    Task<BackofficeUser> GetUserById(string id);
 
     /// <summary>
     /// Find user by email
     /// </summary>
-    Task<IBackofficeUser> GetUserByEmail(string email);
+    Task<BackofficeUser> GetUserByEmail(string email);
 
     /// <summary>
     /// Get users by ids
     /// </summary>
-    Task<Dictionary<string, IBackofficeUser>> GetByIds(params string[] ids);
+    Task<Dictionary<string, BackofficeUser>> GetByIds(params string[] ids);
 
     /// <summary>
     /// Get all users for the selected application
     /// </summary>
-    Task<IList<IBackofficeUser>> GetAll();
+    Task<IList<BackofficeUser>> GetAll();
 
     /// <summary>
     /// Get all available users (with query)
     /// </summary>
-    Task<ListResult<IBackofficeUser>> GetByQuery(ListQuery<IBackofficeUser> query);
+    Task<ListResult<BackofficeUser>> GetByQuery(ListQuery<BackofficeUser> query);
 
     /// <summary>
     /// Creates or updates a user
     /// </summary>
-    Task<EntityResult<IBackofficeUser>> Save(IBackofficeUser model);
+    Task<EntityResult<BackofficeUser>> Save(BackofficeUser model);
 
     /// <summary>
     /// Deletes a user
     /// </summary>
-    Task<EntityResult<IBackofficeUser>> Delete(string id);
+    Task<EntityResult<BackofficeUser>> Delete(string id);
 
     /// <summary>
     /// Changes the password of the current user.
     /// User is logged out if this operation succeeds.
     /// </summary>
-    Task<EntityResult<IBackofficeUser>> UpdatePassword(IBackofficeUser user, string currentPassword, string newPassword);
+    Task<EntityResult<BackofficeUser>> UpdatePassword(BackofficeUser user, string currentPassword, string newPassword);
 
     /// <summary>
     /// Enables a user
     /// </summary>
-    Task<EntityResult<IBackofficeUser>> Enable(IBackofficeUser user);
+    Task<EntityResult<BackofficeUser>> Enable(BackofficeUser user);
 
     /// <summary>
     /// Disables a user
     /// </summary>
-    Task<EntityResult<IBackofficeUser>> Disable(IBackofficeUser user);
+    Task<EntityResult<BackofficeUser>> Disable(BackofficeUser user);
   }
 }
diff --git a/zero.Core/Api/UserRolesApi.cs b/zero.Core/Api/UserRolesApi.cs
index d4b6717e..56d2afce 100644
--- a/zero.Core/Api/UserRolesApi.cs
+++ b/zero.Core/Api/UserRolesApi.cs
@@ -35,28 +35,28 @@ namespace zero.Core.Api
 
 
     /// <inheritdoc />
-    public async Task<IList<IBackofficeUserRole>> GetAll()
+    public async Task<IList<BackofficeUserRole>> GetAll()
     {
       using IAsyncDocumentSession session = Session();
-      return await session.Query<IBackofficeUserRole>().OrderBy(x => x.Sort).ThenBy(x => x.Name).ToListAsync();
+      return await session.Query<BackofficeUserRole>().OrderBy(x => x.Sort).ThenBy(x => x.Name).ToListAsync();
     }
 
 
     /// <inheritdoc />
-    public async Task<IBackofficeUserRole> GetById(string id)
+    public async Task<BackofficeUserRole> GetById(string id)
     {
       return await RoleManager.FindByIdAsync(id);
     }
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<IBackofficeUserRole>> Save(IBackofficeUserRole model)
+    public async Task<EntityResult<BackofficeUserRole>> Save(BackofficeUserRole model)
     {
       ValidationResult validation = await new UserRoleValidator().ValidateAsync(model);
 
       if (!validation.IsValid)
       {
-        return EntityResult<IBackofficeUserRole>.Fail(validation);
+        return EntityResult<BackofficeUserRole>.Fail(validation);
       }
 
       if (model.Id.IsNullOrEmpty())
@@ -80,12 +80,12 @@ namespace zero.Core.Api
         }
       }
 
-      return EntityResult<IBackofficeUserRole>.Success(model);
+      return EntityResult<BackofficeUserRole>.Success(model);
     }
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<IBackofficeUserRole>> Delete(string id)
+    public async Task<EntityResult<BackofficeUserRole>> Delete(string id)
     {
       using (IAsyncDocumentSession session = Session())
       {
@@ -93,7 +93,7 @@ namespace zero.Core.Api
 
         if (country == null)
         {
-          return EntityResult<IBackofficeUserRole>.Fail("@errors.ondelete.idnotfound");
+          return EntityResult<BackofficeUserRole>.Fail("@errors.ondelete.idnotfound");
         }
 
         session.Delete(country);
@@ -101,7 +101,7 @@ namespace zero.Core.Api
         await session.SaveChangesAsync();
       }
 
-      return EntityResult<IBackofficeUserRole>.Success();
+      return EntityResult<BackofficeUserRole>.Success();
     }
   }
 
@@ -111,21 +111,21 @@ namespace zero.Core.Api
     /// <summary>
     /// Get all user roles
     /// </summary>
-    Task<IList<IBackofficeUserRole>> GetAll();
+    Task<IList<BackofficeUserRole>> GetAll();
 
     /// <summary>
     /// Get role by id
     /// </summary>
-    Task<IBackofficeUserRole> GetById(string id);
+    Task<BackofficeUserRole> GetById(string id);
 
     /// <summary>
     /// Create or update a role
     /// </summary>
-    Task<EntityResult<IBackofficeUserRole>> Save(IBackofficeUserRole model);
+    Task<EntityResult<BackofficeUserRole>> Save(BackofficeUserRole model);
 
     /// <summary>
     /// Deletes a role
     /// </summary>
-    Task<EntityResult<IBackofficeUserRole>> Delete(string id);
+    Task<EntityResult<BackofficeUserRole>> Delete(string id);
   }
 }
diff --git a/zero.Core/ApplicationResolver.cs b/zero.Core/ApplicationResolver.cs
index fc78f1b0..76989417 100644
--- a/zero.Core/ApplicationResolver.cs
+++ b/zero.Core/ApplicationResolver.cs
@@ -28,7 +28,7 @@ namespace zero.Core
 
     protected IHandlerHolder Handler { get; private set; }
 
-    private IList<IApplication> Apps { get; set; }
+    private IList<Application> Apps { get; set; }
 
 
 
@@ -42,7 +42,7 @@ namespace zero.Core
 
 
     /// <inheritdoc />
-    public async Task<IApplication> Resolve(HttpContext context, ClaimsPrincipal user)
+    public async Task<Application> Resolve(HttpContext context, ClaimsPrincipal user)
     {
       if (context?.Request == null)
       {
@@ -50,7 +50,7 @@ namespace zero.Core
         return null;
       }
 
-      IApplication app;
+      Application app;
 
       if (context.IsBackofficeRequest(Options.BackofficePath))
       {
@@ -64,7 +64,7 @@ namespace zero.Core
       if (app == null)
       {
         //Logger.LogWarning("Could not resolve application for host {host}", context.Request.Host);
-        IList<IApplication> apps = await GetApplications();
+        IList<Application> apps = await GetApplications();
         app = apps.FirstOrDefault();
       }
 
@@ -73,15 +73,15 @@ namespace zero.Core
 
 
     /// <inheritdoc />
-    public async Task<IApplication> ResolveFromUser(ClaimsPrincipal user)
+    public async Task<Application> ResolveFromUser(ClaimsPrincipal user)
     {
-      IBackofficeUser userEntity = await GetBackofficeUser(user);
+      BackofficeUser userEntity = await GetBackofficeUser(user);
       return await ResolveFromUser(userEntity);
     }
 
 
     /// <inheritdoc />
-    public async Task<IApplication> ResolveFromUser(IBackofficeUser user)
+    public async Task<Application> ResolveFromUser(BackofficeUser user)
     {
       if (user == null)
       {
@@ -113,26 +113,26 @@ namespace zero.Core
       }
 
       using IAsyncDocumentSession session = Store.OpenCoreSession();
-      return await session.LoadAsync<IApplication>(appId);
+      return await session.LoadAsync<Application>(appId);
     }
 
 
     /// <inheritdoc />
-    public async Task<IApplication> ResolveFromRequest(HttpContext context)
+    public async Task<Application> ResolveFromRequest(HttpContext context)
     {
       return Handler.Get<IApplicationResolverHandler>()?.Resolve(context.Request, await GetApplications()) ?? await ResolveFromUri(context.Request.GetEncodedUrl());
     }
 
 
     /// <inheritdoc />
-    public async Task<IApplication> ResolveFromUri(string uriString)
+    public async Task<Application> ResolveFromUri(string uriString)
     {
       return ResolveFromUriInternal(new Uri(uriString, UriKind.Absolute), await GetApplications());
     }
 
 
     /// <inheritdoc />
-    public async Task<IApplication> ResolveFromUri(Uri uri)
+    public async Task<Application> ResolveFromUri(Uri uri)
     {
       return ResolveFromUriInternal(uri, await GetApplications());
     }
@@ -141,9 +141,9 @@ namespace zero.Core
     /// <summary>
     /// Get matching application from an URI
     /// </summary>
-    IApplication ResolveFromUriInternal(Uri uri, IList<IApplication> apps)
+    Application ResolveFromUriInternal(Uri uri, IList<Application> apps)
     {
-      foreach (IApplication app in apps)
+      foreach (Application app in apps)
       {
         if (app.Domains?.Length < 1)
         {
@@ -168,7 +168,7 @@ namespace zero.Core
     /// <summary>
     /// Get all applications to choose from
     /// </summary>
-    async Task<IList<IApplication>> GetApplications()
+    async Task<IList<Application>> GetApplications()
     {
       if (Apps != null)
       {
@@ -176,7 +176,7 @@ namespace zero.Core
       }
 
       using IAsyncDocumentSession session = Store.OpenCoreSession();
-      Apps = await session.Query<IApplication>().ToListAsync();
+      Apps = await session.Query<Application>().ToListAsync();
       return Apps;
     }
 
@@ -184,12 +184,12 @@ namespace zero.Core
     /// <summary>
     /// Get backoffice user from claims principal
     /// </summary>
-    async Task<IBackofficeUser> GetBackofficeUser(ClaimsPrincipal user)
+    async Task<BackofficeUser> GetBackofficeUser(ClaimsPrincipal user)
     {
       string userId = user.FindFirstValue(Constants.Auth.Claims.UserId);
 
       using IAsyncDocumentSession session = Store.OpenCoreSession();
-      return await session.LoadAsync<IBackofficeUser>(userId);
+      return await session.LoadAsync<BackofficeUser>(userId);
     }
   }
 
@@ -200,33 +200,33 @@ namespace zero.Core
     /// Resolves the current application from either the backoffice user (in case it is backoffice request)
     /// or the domain (in case it is frontend request).
     /// </summary>
-    Task<IApplication> Resolve(HttpContext context, ClaimsPrincipal user);
+    Task<Application> Resolve(HttpContext context, ClaimsPrincipal user);
 
     /// <summary>
     /// Resolves the current application from the request path
     /// </summary>
-    Task<IApplication> ResolveFromRequest(HttpContext context);
+    Task<Application> ResolveFromRequest(HttpContext context);
 
     /// <summary>
     /// Get matching application from an URI string
     /// </summary>
-    Task<IApplication> ResolveFromUri(string uriString);
+    Task<Application> ResolveFromUri(string uriString);
 
     /// <summary>
     /// Get matching application from an URI
     /// </summary>
-    Task<IApplication> ResolveFromUri(Uri uri);
+    Task<Application> ResolveFromUri(Uri uri);
 
     /// <summary>
     /// Resolves the current application from the logged-in backoffice user.
     /// This method won't return apps the user has no access to.
     /// </summary>
-    Task<IApplication> ResolveFromUser(ClaimsPrincipal user);
+    Task<Application> ResolveFromUser(ClaimsPrincipal user);
 
     /// <summary>
     /// Resolves the current application from a user.
     /// This method won't return apps the user has no access to.
     /// </summary>
-    Task<IApplication> ResolveFromUser(IBackofficeUser user);
+    Task<Application> ResolveFromUser(BackofficeUser user);
   }
 }
diff --git a/zero.Core/Collections/CollectionBase.cs b/zero.Core/Collections/CollectionBase.cs
index d5babe07..80d65e0e 100644
--- a/zero.Core/Collections/CollectionBase.cs
+++ b/zero.Core/Collections/CollectionBase.cs
@@ -17,7 +17,7 @@ using zero.Core.Utils;
 
 namespace zero.Core.Collections
 {
-  public abstract class CollectionBase<T> : ICollectionBase<T>, IDisposable where T : IZeroEntity
+  public abstract class CollectionBase<T> : ICollectionBase<T>, IDisposable where T : ZeroEntity
   {
     private IAsyncDocumentSession _session;
     private string _database;
@@ -216,11 +216,7 @@ namespace zero.Core.Collections
 
         model.CreatedDate = DateTimeOffset.Now;
         model.CreatedById = userId;
-
-        if (model is ILanguageAwareEntity)
-        {
-          (model as ILanguageAwareEntity).LanguageId = "languages.1-A"; // TODO correct language id
-        }
+        model.LanguageId = "languages.1-A"; // TODO correct language id
       }
 
       // update name alias and last modified
@@ -425,7 +421,7 @@ namespace zero.Core.Collections
   }
 
 
-  public interface ICollectionBase<T> : IDisposable where T : IZeroEntity
+  public interface ICollectionBase<T> : IDisposable where T : ZeroEntity
   {
     /// <summary>
     /// Guid for this instance
diff --git a/zero.Core/Collections/CollectionConfigBase.cs b/zero.Core/Collections/CollectionConfigBase.cs
deleted file mode 100644
index 0dc8d631..00000000
--- a/zero.Core/Collections/CollectionConfigBase.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-using FluentValidation;
-using Raven.Client.Documents;
-using Raven.Client.Documents.Linq;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using zero.Core.Entities;
-using zero.Core.Extensions;
-using zero.Core.Options;
-
-namespace zero.Core.Collections
-{
-  public abstract class CollectionConfigBase<T> : CollectionBase<T>, IFixedCollectionBase<T>, IDisposable where T : IZeroConfigEntity
-  {
-    public CollectionConfigBase(IZeroContext context, ICollectionInterceptorHandler interceptorHandler = null, IValidator<T> validator = null) : base(context, interceptorHandler, validator) { }
-
-
-    protected abstract IEnumerable<OptionsType> GetDefinedTypes();
-
-
-    /// <inheritdoc />
-    public virtual async Task<TSpecific> GetByType<TSpecific>() where TSpecific : T, new()
-    {
-      OptionsType type = GetDefinedTypes().FirstOrDefault(x => x.ContentType == typeof(TSpecific));
-      return await GetEntity<TSpecific>(type);
-    }
-
-
-    /// <inheritdoc />
-    public virtual async Task<TSpecific> GetByType<TSpecific>(string alias) where TSpecific : T, new()
-    {
-      OptionsType type = GetDefinedTypes().FirstOrDefault(x => x.ContentType == typeof(TSpecific) && x.Alias.Equals(alias, StringComparison.InvariantCultureIgnoreCase));
-      return await GetEntity<TSpecific>(type);
-    }
-
-
-    /// <inheritdoc />
-    public virtual async Task<T> GetByAlias(string alias)
-    {
-      OptionsType type = GetDefinedTypes().FirstOrDefault(x => x.Alias.Equals(alias, StringComparison.InvariantCultureIgnoreCase));
-      return type != null ? await Session.Query<T>().FirstOrDefaultAsync(x => x.TypeAlias == type.Alias) : default;
-    }
-
-
-    ///// <inheritdoc />
-    //public override async Task<ListResult<T>> GetByQuery(ListQuery<T> query)
-    //{
-    //  ListResult<T> list = await Session.Query<T>().OrderByDescending(x => x.CreatedDate).ToQueriedListAsync(query);
-    //}
-
-
-    /// <summary>
-    /// Get data from database
-    /// </summary>
-    async Task<TSpecific> GetEntity<TSpecific>(OptionsType type) where TSpecific : T, new()
-    {
-      if (type == null)
-      {
-        return default;
-      }
-
-      TSpecific model = await Session.Query<TSpecific>().FirstOrDefaultAsync(x => x.TypeAlias == type.Alias);
-
-      if (model == null) //&& type.IsAutoActivated)
-      {
-        return new TSpecific();
-      }
-
-      return model;
-    }
-  }
-
-
-  public interface IFixedCollectionBase<T> : IDisposable where T : IZeroEntity
-  {
-    /// <summary>
-    /// Guid for this instance
-    /// </summary>
-    Guid Guid { get; }
-
-    /// <summary>
-    /// The database to operate on.
-    /// Is null by default, which uses the database from the resolved application.
-    /// </summary>
-    string Database { get; set; }
-
-    /// <summary>
-    /// Returns a new document queryable
-    /// </summary>
-    IRavenQueryable<T> Query { get; }
-
-    /// <summary>
-    /// Applies the scope to the service instance
-    /// </summary>
-    void ApplyScope(string scope);
-
-    /// <summary>
-    /// Get an entity by alias
-    /// </summary>
-    //Task<T> GetByAlias(string alias);
-  }
-}
diff --git a/zero.Core/Collections/CollectionInterceptor.cs b/zero.Core/Collections/CollectionInterceptor.cs
index 2e07a824..7c9d25cc 100644
--- a/zero.Core/Collections/CollectionInterceptor.cs
+++ b/zero.Core/Collections/CollectionInterceptor.cs
@@ -2,8 +2,6 @@
 using Raven.Client.Documents.Session;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
 using System.Threading.Tasks;
 using zero.Core.Database;
 using zero.Core.Entities;
@@ -16,31 +14,31 @@ namespace zero.Core.Collections
     public virtual HashSet<Type> Types { get; } = new();
 
     /// <inheritdoc />
-    public virtual Task<EntityResult<T>> Creating<T>(CreateParameters<T> args) where T : IZeroEntity => Task.FromResult<EntityResult<T>>(default);
+    public virtual Task<EntityResult<T>> Creating<T>(CreateParameters<T> args) where T : ZeroEntity => Task.FromResult<EntityResult<T>>(default);
 
     /// <inheritdoc />
-    public virtual Task<EntityResult<T>> Updating<T>(UpdateParameters<T> args) where T : IZeroEntity => Task.FromResult<EntityResult<T>>(default);
+    public virtual Task<EntityResult<T>> Updating<T>(UpdateParameters<T> args) where T : ZeroEntity => Task.FromResult<EntityResult<T>>(default);
 
     /// <inheritdoc />
-    public virtual Task<EntityResult<T>> Deleting<T>(DeleteParameters<T> args) where T : IZeroEntity => Task.FromResult<EntityResult<T>>(default);
+    public virtual Task<EntityResult<T>> Deleting<T>(DeleteParameters<T> args) where T : ZeroEntity => Task.FromResult<EntityResult<T>>(default);
 
     /// <inheritdoc />
-    public virtual Task<EntityResult<T>> Purging<T>(PurgeParameters<T> args) where T : IZeroEntity => Task.FromResult<EntityResult<T>>(default);
+    public virtual Task<EntityResult<T>> Purging<T>(PurgeParameters<T> args) where T : ZeroEntity => Task.FromResult<EntityResult<T>>(default);
 
     /// <inheritdoc />
-    public virtual Task Created<T>(CreateParameters<T> args) where T : IZeroEntity => Task.CompletedTask;
+    public virtual Task Created<T>(CreateParameters<T> args) where T : ZeroEntity => Task.CompletedTask;
 
     /// <inheritdoc />
-    public virtual Task Updated<T>(UpdateParameters<T> args) where T : IZeroEntity => Task.CompletedTask;
+    public virtual Task Updated<T>(UpdateParameters<T> args) where T : ZeroEntity => Task.CompletedTask;
 
     /// <inheritdoc />
-    public virtual Task Deleted<T>(DeleteParameters<T> args) where T : IZeroEntity => Task.CompletedTask;
+    public virtual Task Deleted<T>(DeleteParameters<T> args) where T : ZeroEntity => Task.CompletedTask;
 
     /// <inheritdoc />
-    public virtual Task Purged<T>(PurgeParameters<T> args) where T : IZeroEntity => Task.CompletedTask;
+    public virtual Task Purged<T>(PurgeParameters<T> args) where T : ZeroEntity => Task.CompletedTask;
 
 
-    public class Parameters<T> where T : IZeroEntity
+    public class Parameters<T> where T : ZeroEntity
     {
       /// <summary>
       /// The current zero context
@@ -63,7 +61,7 @@ namespace zero.Core.Collections
       public IValidator<T> Validator { get; set; }
     }
 
-    public class CreateParameters<T> : Parameters<T> where T : IZeroEntity
+    public class CreateParameters<T> : Parameters<T> where T : ZeroEntity
     {
       /// <summary>
       /// The model which is created
@@ -71,7 +69,7 @@ namespace zero.Core.Collections
       public T Model { get; set; }
     }
 
-    public class UpdateParameters<T> : Parameters<T> where T : IZeroEntity
+    public class UpdateParameters<T> : Parameters<T> where T : ZeroEntity
     {
       /// <summary>
       /// The Id of the model which is updated
@@ -84,7 +82,7 @@ namespace zero.Core.Collections
       public T Model { get; set; }
     }
 
-    public class DeleteParameters<T> : Parameters<T> where T : IZeroEntity
+    public class DeleteParameters<T> : Parameters<T> where T : ZeroEntity
     {
       /// <summary>
       /// The id of the model which is deleted
@@ -97,7 +95,7 @@ namespace zero.Core.Collections
       public T Model { get; set; }
     }
 
-    public class PurgeParameters<T> : Parameters<T> where T : IZeroEntity { }
+    public class PurgeParameters<T> : Parameters<T> where T : ZeroEntity { }
   }
 
 
@@ -111,41 +109,41 @@ namespace zero.Core.Collections
     /// <summary>
     /// Called after an entity has been stored but before the session has saved its changes
     /// </summary>
-    Task Created<T>(CollectionInterceptor.CreateParameters<T> args) where T : IZeroEntity;
+    Task Created<T>(CollectionInterceptor.CreateParameters<T> args) where T : ZeroEntity;
 
     /// <summary>
     /// Called before an entity is stored and validated
     /// </summary>
-    Task<EntityResult<T>> Creating<T>(CollectionInterceptor.CreateParameters<T> args) where T : IZeroEntity;
+    Task<EntityResult<T>> Creating<T>(CollectionInterceptor.CreateParameters<T> args) where T : ZeroEntity;
 
     /// <summary>
     /// Called after an entity has been deleted but before the session has saved its changes
     /// </summary>
-    Task Deleted<T>(CollectionInterceptor.DeleteParameters<T> args) where T : IZeroEntity;
+    Task Deleted<T>(CollectionInterceptor.DeleteParameters<T> args) where T : ZeroEntity;
 
     /// <summary>
     /// Called before an entity is deleted
     /// </summary>
-    Task<EntityResult<T>> Deleting<T>(CollectionInterceptor.DeleteParameters<T> args) where T : IZeroEntity;
+    Task<EntityResult<T>> Deleting<T>(CollectionInterceptor.DeleteParameters<T> args) where T : ZeroEntity;
 
     /// <summary>
     /// Called after the document collection has been purged
     /// </summary>
-    Task Purged<T>(CollectionInterceptor.PurgeParameters<T> args) where T : IZeroEntity;
+    Task Purged<T>(CollectionInterceptor.PurgeParameters<T> args) where T : ZeroEntity;
 
     /// <summary>
     /// Called before a collection is purged
     /// </summary>
-    Task<EntityResult<T>> Purging<T>(CollectionInterceptor.PurgeParameters<T> args) where T : IZeroEntity;
+    Task<EntityResult<T>> Purging<T>(CollectionInterceptor.PurgeParameters<T> args) where T : ZeroEntity;
 
     /// <summary>
     /// Called after an entity has been updated but before the session has saved its changes
     /// </summary>
-    Task Updated<T>(CollectionInterceptor.UpdateParameters<T> args) where T : IZeroEntity;
+    Task Updated<T>(CollectionInterceptor.UpdateParameters<T> args) where T : ZeroEntity;
 
     /// <summary>
     /// Called before an entity is stored and validated
     /// </summary>
-    Task<EntityResult<T>> Updating<T>(CollectionInterceptor.UpdateParameters<T> args) where T : IZeroEntity;
+    Task<EntityResult<T>> Updating<T>(CollectionInterceptor.UpdateParameters<T> args) where T : ZeroEntity;
   }
 }
diff --git a/zero.Core/Collections/CollectionStaticBase.cs b/zero.Core/Collections/CollectionStaticBase.cs
index 0bc5c0e0..ca07d65e 100644
--- a/zero.Core/Collections/CollectionStaticBase.cs
+++ b/zero.Core/Collections/CollectionStaticBase.cs
@@ -120,7 +120,7 @@
 //  }
 
 
-//  public interface IICollectionPredefinedBase<T> : IDisposable where T : IZeroEntity
+//  public interface IICollectionPredefinedBase<T> : IDisposable where T : ZeroEntity
 //  {
 //    /// <summary>
 //    /// Guid for this instance
diff --git a/zero.Core/Collections/Countries/CountriesCollection.cs b/zero.Core/Collections/Countries/CountriesCollection.cs
index 5f093c9f..7b6f9b38 100644
--- a/zero.Core/Collections/Countries/CountriesCollection.cs
+++ b/zero.Core/Collections/Countries/CountriesCollection.cs
@@ -7,20 +7,20 @@ using zero.Core.Extensions;
 
 namespace zero.Core.Collections
 {
-  public class CountriesCollection : CollectionBase<ICountry>, ICountriesCollection
+  public class CountriesCollection : CollectionBase<Country>, ICountriesCollection
   {
-    public CountriesCollection(IZeroContext context, ICollectionInterceptorHandler interceptor, IValidator<ICountry> validator) : base(context, interceptor, validator) { }
+    public CountriesCollection(IZeroContext context, ICollectionInterceptorHandler interceptor, IValidator<Country> validator) : base(context, interceptor, validator) { }
 
 
     /// <inheritdoc />
-    public override IAsyncEnumerable<ICountry> Stream()
+    public override IAsyncEnumerable<Country> Stream()
     {
       return base.Stream(q => q.OrderByDescending(x => x.IsPreferred).ThenBy(x => x.Name));
     }
   }
 
 
-  public interface ICountriesCollection : ICollectionBase<ICountry>
+  public interface ICountriesCollection : ICollectionBase<Country>
   {
 
   }
diff --git a/zero.Core/Collections/Countries/CountryValidator.cs b/zero.Core/Collections/Countries/CountryValidator.cs
index e4f50650..5f9cffab 100644
--- a/zero.Core/Collections/Countries/CountryValidator.cs
+++ b/zero.Core/Collections/Countries/CountryValidator.cs
@@ -6,7 +6,7 @@ using zero.Core.Validation;
 
 namespace zero.Core.Collections
 {
-  public class CountryValidator : ZeroValidator<ICountry>
+  public class CountryValidator : ZeroValidator<Country>
   {
     public CountryValidator(IBackofficeStore store)
     {
diff --git a/zero.Core/Collections/Integrations/IntegrationsCollection.cs b/zero.Core/Collections/Integrations/IntegrationsCollection.cs
index 9e8d8961..194e8a30 100644
--- a/zero.Core/Collections/Integrations/IntegrationsCollection.cs
+++ b/zero.Core/Collections/Integrations/IntegrationsCollection.cs
@@ -12,7 +12,7 @@ using zero.Core.Options;
 
 namespace zero.Core.Collections
 {
-  public class IntegrationsCollection : CollectionBase<IIntegration>, IIntegrationsCollection
+  public class IntegrationsCollection : CollectionBase<Integration>, IIntegrationsCollection
   {
     /// <inheritdoc />
     public IReadOnlyCollection<IntegrationType> RegisteredTypes { get; private set; }
@@ -31,7 +31,7 @@ namespace zero.Core.Collections
 
 
     /// <inheritdoc />
-    public IIntegration GetEmpty(string alias)
+    public Integration GetEmpty(string alias)
     {
       IntegrationType type = RegisteredTypes.FirstOrDefault(x => x.Alias.Equals(alias, StringComparison.InvariantCultureIgnoreCase));
 
@@ -42,7 +42,7 @@ namespace zero.Core.Collections
 
       try
       {
-        IIntegration model = Activator.CreateInstance(type.ContentType) as IIntegration;
+        Integration model = Activator.CreateInstance(type.ContentType) as Integration;
         model.TypeAlias = type.Alias;
         return model;
       }
@@ -56,7 +56,7 @@ namespace zero.Core.Collections
 
 
     /// <inheritdoc />
-    public async Task<IIntegration> GetByAlias(string alias)
+    public async Task<Integration> GetByAlias(string alias)
     {
       IntegrationType type = RegisteredTypes.FirstOrDefault(x => x.Alias.Equals(alias, StringComparison.InvariantCultureIgnoreCase));
       return await Load<Integration>(type);
@@ -64,7 +64,7 @@ namespace zero.Core.Collections
 
 
     /// <inheritdoc />
-    public async Task<T> Get<T>(string alias = null) where T : IIntegration, new()
+    public async Task<T> Get<T>(string alias = null) where T : Integration, new()
     {
       IntegrationType type = RegisteredTypes.FirstOrDefault(x => x.ContentType == typeof(T) && (alias.IsNullOrEmpty() || x.Alias.Equals(alias, StringComparison.InvariantCultureIgnoreCase)));
       return await Load<T>(type);
@@ -72,17 +72,17 @@ namespace zero.Core.Collections
 
 
     /// <inheritdoc />
-    public async Task<IList<IIntegration>> GetByTag(string tag)
+    public async Task<IList<Integration>> GetByTag(string tag)
     {
       IEnumerable<IntegrationType> types = RegisteredTypes.Where(x => x.Tags.Contains(tag, StringComparer.InvariantCultureIgnoreCase));
 
       if (!types.Any())
       {
-        return new List<IIntegration>();
+        return new List<Integration>();
       }
 
       string[] aliases = types.Select(x => x.Alias).ToArray();
-      return await Session.Query<IIntegration>().Where(x => x.TypeAlias.In(aliases)).ToListAsync();
+      return await Session.Query<Integration>().Where(x => x.TypeAlias.In(aliases)).ToListAsync();
     }
 
 
@@ -94,14 +94,14 @@ namespace zero.Core.Collections
 
 
     /// <inheritdoc />
-    public override async Task<ListResult<IIntegration>> GetByQuery(ListQuery<IIntegration> query)
+    public override async Task<ListResult<Integration>> GetByQuery(ListQuery<Integration> query)
     {
-      List<IIntegration> result = new();
-      List<IIntegration> models = await Session.Query<IIntegration>().ToListAsync();
+      List<Integration> result = new();
+      List<Integration> models = await Session.Query<Integration>().ToListAsync();
 
       foreach (IntegrationType type in RegisteredTypes)
       {
-        IIntegration model = models.FirstOrDefault(x => x.TypeAlias == type.Alias);
+        Integration model = models.FirstOrDefault(x => x.TypeAlias == type.Alias);
 
         if (model != null)
         {
@@ -118,11 +118,11 @@ namespace zero.Core.Collections
     public async Task<IList<IntegrationTypeWithStatus>> GetTypesWithStatus()
     {
       List<IntegrationTypeWithStatus> result = new();
-      List<IIntegration> models = await Session.Query<IIntegration>().ToListAsync();
+      List<Integration> models = await Session.Query<Integration>().ToListAsync();
 
       foreach (IntegrationType type in RegisteredTypes)
       {
-        IIntegration model = models.FirstOrDefault(x => x.TypeAlias == type.Alias);
+        Integration model = models.FirstOrDefault(x => x.TypeAlias == type.Alias);
 
         result.Add(new()
         {
@@ -138,31 +138,31 @@ namespace zero.Core.Collections
 
 
     /// <inheritdoc />
-    public override async Task<EntityResult<IIntegration>> Save(IIntegration model)
+    public override async Task<EntityResult<Integration>> Save(Integration model)
     {
       if (model == null)
       {
-        return EntityResult<IIntegration>.Fail("@integration.errors.notfound");
+        return EntityResult<Integration>.Fail("@integration.errors.notfound");
       }
 
       IntegrationType type = RegisteredTypes.FirstOrDefault(x => x.Alias.Equals(model.TypeAlias, StringComparison.InvariantCultureIgnoreCase));
 
       if (type == null)
       {
-        return EntityResult<IIntegration>.Fail("@integration.errors.typenotfound");
+        return EntityResult<Integration>.Fail("@integration.errors.typenotfound");
       }
 
-      string existingId = await Session.Query<IIntegration>().Where(x => x.TypeAlias == type.Alias).Select(x => x.Id).FirstOrDefaultAsync();
+      string existingId = await Session.Query<Integration>().Where(x => x.TypeAlias == type.Alias).Select(x => x.Id).FirstOrDefaultAsync();
 
       if (!existingId.IsNullOrEmpty() && existingId != model.Id)
       {
-        return EntityResult<IIntegration>.Fail("@integration.errors.multiplenotallowed");
+        return EntityResult<Integration>.Fail("@integration.errors.multiplenotallowed");
       }
 
       model.Alias = type.Alias;
       model.Name = null;
 
-      EntityResult<IIntegration> result = await base.Save(model);
+      EntityResult<Integration> result = await base.Save(model);
 
       if (result.IsSuccess)
       {
@@ -174,9 +174,9 @@ namespace zero.Core.Collections
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<IIntegration>> Activate(string alias)
+    public async Task<EntityResult<Integration>> Activate(string alias)
     {
-      IIntegration model = await GetByAlias(alias);
+      Integration model = await GetByAlias(alias);
       if (model != null)
       { 
         model.IsActive = true;
@@ -186,9 +186,9 @@ namespace zero.Core.Collections
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<IIntegration>> Deactivate(string alias)
+    public async Task<EntityResult<Integration>> Deactivate(string alias)
     {
-      IIntegration model = await GetByAlias(alias);
+      Integration model = await GetByAlias(alias);
       if (model != null)
       {
         model.IsActive = false;
@@ -198,7 +198,7 @@ namespace zero.Core.Collections
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<IIntegration>> Delete(string alias)
+    public async Task<EntityResult<Integration>> Delete(string alias)
     {
       return await base.Delete(await GetByAlias(alias));
     }
@@ -207,7 +207,7 @@ namespace zero.Core.Collections
     /// <summary>
     /// Get integration data from database
     /// </summary>
-    protected async Task<T> Load<T>(IntegrationType type) where T : IIntegration, new()
+    protected async Task<T> Load<T>(IntegrationType type) where T : Integration, new()
     {
       if (type == null)
       {
@@ -242,22 +242,22 @@ namespace zero.Core.Collections
     /// <summary>
     /// Get new integration model for the specified integration type alias
     /// </summary>
-    IIntegration GetEmpty(string alias);
+    Integration GetEmpty(string alias);
 
     /// <summary>
     /// Get integration by an alias
     /// </summary>
-    Task<IIntegration> GetByAlias(string alias);
+    Task<Integration> GetByAlias(string alias);
 
     /// <summary>
     /// Get an integration by type and optional alias
     /// </summary>
-    Task<T> Get<T>(string alias = null) where T : IIntegration, new();
+    Task<T> Get<T>(string alias = null) where T : Integration, new();
 
     /// <summary>
     /// Get all integrations by a certain tag
     /// </summary>
-    Task<IList<IIntegration>> GetByTag(string tag);
+    Task<IList<Integration>> GetByTag(string tag);
 
     /// <summary>
     /// Check if any integrations of certain tag are activated
@@ -267,7 +267,7 @@ namespace zero.Core.Collections
     /// <summary>
     /// Get all integrations with the specified query
     /// </summary>
-    Task<ListResult<IIntegration>> GetByQuery(ListQuery<IIntegration> query);
+    Task<ListResult<Integration>> GetByQuery(ListQuery<Integration> query);
 
     /// <summary>
     /// Get all integration types with their configuration status
@@ -277,21 +277,21 @@ namespace zero.Core.Collections
     /// <summary>
     /// Saves an integration
     /// </summary>
-    Task<EntityResult<IIntegration>> Save(IIntegration model);
+    Task<EntityResult<Integration>> Save(Integration model);
 
     /// <summary>
     /// Activates a configured integration
     /// </summary>
-    Task<EntityResult<IIntegration>> Activate(string alias);
+    Task<EntityResult<Integration>> Activate(string alias);
 
     /// <summary>
     /// Disables a configured integration
     /// </summary>
-    Task<EntityResult<IIntegration>> Deactivate(string alias);
+    Task<EntityResult<Integration>> Deactivate(string alias);
 
     /// <summary>
     /// Deletes configuration of an integration and disables it
     /// </summary>
-    Task<EntityResult<IIntegration>> Delete(string alias);
+    Task<EntityResult<Integration>> Delete(string alias);
   }
 }
diff --git a/zero.Core/Collections/Languages/LanguageValidator.cs b/zero.Core/Collections/Languages/LanguageValidator.cs
index e7f6d215..eb941c2b 100644
--- a/zero.Core/Collections/Languages/LanguageValidator.cs
+++ b/zero.Core/Collections/Languages/LanguageValidator.cs
@@ -7,7 +7,7 @@ using zero.Core.Validation;
 
 namespace zero.Core.Collections
 {
-  public class LanguageValidator : ZeroValidator<ILanguage>
+  public class LanguageValidator : ZeroValidator<Language>
   {
     public LanguageValidator(IBackofficeStore store)
     {
diff --git a/zero.Core/Collections/Languages/LanguagesCollection.cs b/zero.Core/Collections/Languages/LanguagesCollection.cs
index 591612e1..2b550842 100644
--- a/zero.Core/Collections/Languages/LanguagesCollection.cs
+++ b/zero.Core/Collections/Languages/LanguagesCollection.cs
@@ -10,13 +10,13 @@ using zero.Core.Extensions;
 
 namespace zero.Core.Collections
 {
-  public class LanguagesCollection : CollectionBase<ILanguage>, ILanguagesCollection
+  public class LanguagesCollection : CollectionBase<Language>, ILanguagesCollection
   {
-    public LanguagesCollection(IZeroContext context, ICollectionInterceptorHandler interceptor, IValidator<ILanguage> validator) : base(context, interceptor, validator) { }
+    public LanguagesCollection(IZeroContext context, ICollectionInterceptorHandler interceptor, IValidator<Language> validator) : base(context, interceptor, validator) { }
 
 
     /// <inheritdoc />
-    public override IAsyncEnumerable<ILanguage> Stream()
+    public override IAsyncEnumerable<Language> Stream()
     {
       return base.Stream(q => q.OrderByDescending(x => x.CreatedDate));
     }
@@ -40,7 +40,7 @@ namespace zero.Core.Collections
   }
 
 
-  public interface ILanguagesCollection : ICollectionBase<ILanguage>
+  public interface ILanguagesCollection : ICollectionBase<Language>
   {
     /// <summary>
     /// Get all available cultures
diff --git a/zero.Core/Collections/MailTemplates/MailTemplateValidator.cs b/zero.Core/Collections/MailTemplates/MailTemplateValidator.cs
index 6a641afa..6c54d77f 100644
--- a/zero.Core/Collections/MailTemplates/MailTemplateValidator.cs
+++ b/zero.Core/Collections/MailTemplates/MailTemplateValidator.cs
@@ -3,7 +3,7 @@ using zero.Core.Validation;
 
 namespace zero.Core.Collections
 {
-  public class MailTemplateValidator : ZeroValidator<IMailTemplate>
+  public class MailTemplateValidator : ZeroValidator<MailTemplate>
   {
     public MailTemplateValidator()
     {
diff --git a/zero.Core/Collections/MailTemplates/MailTemplatesCollection.cs b/zero.Core/Collections/MailTemplates/MailTemplatesCollection.cs
index d02f415e..39fb20f5 100644
--- a/zero.Core/Collections/MailTemplates/MailTemplatesCollection.cs
+++ b/zero.Core/Collections/MailTemplates/MailTemplatesCollection.cs
@@ -5,24 +5,24 @@ using zero.Core.Entities;
 
 namespace zero.Core.Collections
 {
-  public class MailTemplatesCollection : CollectionBase<IMailTemplate>, IMailTemplatesCollection
+  public class MailTemplatesCollection : CollectionBase<MailTemplate>, IMailTemplatesCollection
   {
-    public MailTemplatesCollection(IZeroContext context, ICollectionInterceptorHandler interceptor, IValidator<IMailTemplate> validator) : base(context, interceptor, validator) { }
+    public MailTemplatesCollection(IZeroContext context, ICollectionInterceptorHandler interceptor, IValidator<MailTemplate> validator) : base(context, interceptor, validator) { }
 
 
     /// <inheritdoc />
-    public async Task<IMailTemplate> GetByKey(string key)
+    public async Task<MailTemplate> GetByKey(string key)
     {
       return await Query.FirstOrDefaultAsync(x => x.Key == key);
     }
   }
 
 
-  public interface IMailTemplatesCollection : ICollectionBase<IMailTemplate>
+  public interface IMailTemplatesCollection : ICollectionBase<MailTemplate>
   {
     /// <summary>
     /// Get mail template by associated key
     /// </summary>
-    Task<IMailTemplate> GetByKey(string key);
+    Task<MailTemplate> GetByKey(string key);
   }
 }
diff --git a/zero.Core/Collections/Media/MediaCollection.cs b/zero.Core/Collections/Media/MediaCollection.cs
index fc8c97ba..3a0ba216 100644
--- a/zero.Core/Collections/Media/MediaCollection.cs
+++ b/zero.Core/Collections/Media/MediaCollection.cs
@@ -19,12 +19,12 @@ using zero.Core.Extensions;
 
 namespace zero.Core.Collections
 {
-  public class MediaCollection : CollectionBase<IMedia>, IMediaCollection
+  public class MediaCollection : CollectionBase<Media>, IMediaCollection
   {
     private IAsyncDocumentSession _coreSession;
 
 
-    public MediaCollection(IZeroContext context, ICollectionInterceptorHandler interceptor, IValidator<IMedia> validator, IPaths paths) : base(context, interceptor, validator)
+    public MediaCollection(IZeroContext context, ICollectionInterceptorHandler interceptor, IValidator<Media> validator, IPaths paths) : base(context, interceptor, validator)
     {
       PreSave = model => model.IsActive = true;
       Paths = paths;
@@ -62,36 +62,36 @@ namespace zero.Core.Collections
     protected IPaths Paths { get; set; }
 
 
-    public override Task<IMedia> GetById(string id)
+    public override Task<Media> GetById(string id)
     {
       ApplyScopeBasedOnId(id);
       return base.GetById(id);
     }
 
 
-    public override async Task<Dictionary<string, IMedia>> GetByIds(params string[] ids)
+    public override async Task<Dictionary<string, Media>> GetByIds(params string[] ids)
     {
       string[] localIds = ids.Where(x => !x.StartsWith(Constants.Database.CoreIdPrefix)).ToArray();
       string[] coreIds = ids.Except(localIds).ToArray();
 
-      Dictionary<string, IMedia> result = new Dictionary<string, IMedia>();
-      Dictionary<string, IMedia> models = null;
+      Dictionary<string, Media> result = new Dictionary<string, Media>();
+      Dictionary<string, Media> models = null;
 
       if (localIds.Length > 0)
       {
-        models = await Session.LoadAsync<IMedia>(localIds);
+        models = await Session.LoadAsync<Media>(localIds);
         foreach (string id in localIds)
         {
-          models.TryGetValue(id, out IMedia model);
+          models.TryGetValue(id, out Media model);
           result.Add(id, model);
         }
       }
       if (coreIds.Length > 0)
       {
-        models = await CoreSession.LoadAsync<IMedia>(coreIds);
+        models = await CoreSession.LoadAsync<Media>(coreIds);
         foreach (string id in coreIds)
         {
-          models.TryGetValue(id, out IMedia model);
+          models.TryGetValue(id, out Media model);
           result.Add(id, model);
         }
       }
@@ -105,7 +105,7 @@ namespace zero.Core.Collections
     {
       ApplyScopeBasedOnId(id);
 
-      IMedia media = await Session.LoadAsync<IMedia>(id);
+      Media media = await Session.LoadAsync<Media>(id);
 
       if (media == null)
       {
@@ -122,7 +122,7 @@ namespace zero.Core.Collections
 
 
     /// <inheritdoc />
-    public async Task<ListResult<IMedia>> GetByQuery(MediaListQuery query)
+    public async Task<ListResult<Media>> GetByQuery(MediaListQuery query)
     {
       ApplyScopeBasedOnId(query.FolderId);
 
@@ -135,14 +135,14 @@ namespace zero.Core.Collections
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<IMedia>> Move(string id, string parentId)
+    public async Task<EntityResult<Media>> Move(string id, string parentId)
     {
-      IMedia model = await GetById(id);
-      IMediaFolder parent = await Session.LoadAsync<IMediaFolder>(parentId);
+      Media model = await GetById(id);
+      MediaFolder parent = await Session.LoadAsync<MediaFolder>(parentId);
 
       if (model == null || (!parentId.IsNullOrEmpty() && parent == null))
       {
-        return EntityResult<IMedia>.Fail("@errors.idnotfound");
+        return EntityResult<Media>.Fail("@errors.idnotfound");
       }
 
       model.FolderId = parent?.Id;
@@ -261,7 +261,7 @@ namespace zero.Core.Collections
     /// <summary>
     /// Saves a thumbnail of an image
     /// </summary>
-    string SaveThumbnail(IMedia media, Image<Rgba32> image, string extensionPrefix, ResizeOptions resizeOptions)
+    string SaveThumbnail(Media media, Image<Rgba32> image, string extensionPrefix, ResizeOptions resizeOptions)
     {
       string extension = Path.GetExtension(media.Source);
 
@@ -294,7 +294,7 @@ namespace zero.Core.Collections
   }
 
 
-  public interface IMediaCollection : ICollectionBase<IMedia>
+  public interface IMediaCollection : ICollectionBase<Media>
   {
     /// <summary>
     /// Get media source by Id
@@ -304,7 +304,7 @@ namespace zero.Core.Collections
     /// <summary>
     /// Get all available media items with query
     /// </summary>
-    Task<ListResult<IMedia>> GetByQuery(MediaListQuery query);
+    Task<ListResult<Media>> GetByQuery(MediaListQuery query);
 
     /// <summary>
     /// Get all available media items (including folders) with query
@@ -314,7 +314,7 @@ namespace zero.Core.Collections
     /// <summary>
     /// Move a file to a new parent
     /// </summary>
-    Task<EntityResult<IMedia>> Move(string id, string parentId);
+    Task<EntityResult<Media>> Move(string id, string parentId);
 
     /// <summary>
     /// Uploads a file to the media folder
diff --git a/zero.Core/Collections/Media/MediaFolderValidator.cs b/zero.Core/Collections/Media/MediaFolderValidator.cs
index 1b298802..20712f66 100644
--- a/zero.Core/Collections/Media/MediaFolderValidator.cs
+++ b/zero.Core/Collections/Media/MediaFolderValidator.cs
@@ -6,7 +6,7 @@ using zero.Core.Validation;
 
 namespace zero.Core.Collections
 {
-  public class MediaFolderValidator : ZeroValidator<IMediaFolder>
+  public class MediaFolderValidator : ZeroValidator<MediaFolder>
   {
     public MediaFolderValidator(IBackofficeStore store)
     {
diff --git a/zero.Core/Collections/Media/MediaValidator.cs b/zero.Core/Collections/Media/MediaValidator.cs
index 6df5c4de..4e3b99d6 100644
--- a/zero.Core/Collections/Media/MediaValidator.cs
+++ b/zero.Core/Collections/Media/MediaValidator.cs
@@ -4,7 +4,7 @@ using zero.Core.Validation;
 
 namespace zero.Core.Collections
 {
-  public class MediaValidator : ZeroValidator<IMedia>
+  public class MediaValidator : ZeroValidator<Media>
   {
     public MediaValidator()
     {
diff --git a/zero.Core/Collections/Translations/TranslationValidator.cs b/zero.Core/Collections/Translations/TranslationValidator.cs
index 00be69eb..231044d6 100644
--- a/zero.Core/Collections/Translations/TranslationValidator.cs
+++ b/zero.Core/Collections/Translations/TranslationValidator.cs
@@ -6,7 +6,7 @@ using zero.Core.Validation;
 
 namespace zero.Core.Collections
 {
-  public class TranslationValidator : ZeroValidator<ITranslation>
+  public class TranslationValidator : ZeroValidator<Translation>
   {
     public TranslationValidator(IBackofficeStore store)
     {
diff --git a/zero.Core/Collections/Translations/TranslationsCollection.cs b/zero.Core/Collections/Translations/TranslationsCollection.cs
index 678e65ed..f1594947 100644
--- a/zero.Core/Collections/Translations/TranslationsCollection.cs
+++ b/zero.Core/Collections/Translations/TranslationsCollection.cs
@@ -7,9 +7,9 @@ using zero.Core.Entities;
 
 namespace zero.Core.Collections
 {
-  public class TranslationsCollection : CollectionBase<ITranslation>, ITranslationsCollection
+  public class TranslationsCollection : CollectionBase<Translation>, ITranslationsCollection
   {
-    public TranslationsCollection(IZeroContext context, ICollectionInterceptorHandler interceptor, IValidator<ITranslation> validator) : base(context, interceptor, validator) { }
+    public TranslationsCollection(IZeroContext context, ICollectionInterceptorHandler interceptor, IValidator<Translation> validator) : base(context, interceptor, validator) { }
 
 
     /// <inheritdoc />
@@ -19,14 +19,14 @@ namespace zero.Core.Collections
     }
 
     /// <inheritdoc />
-    public override IAsyncEnumerable<ITranslation> Stream()
+    public override IAsyncEnumerable<Translation> Stream()
     {
       return base.Stream(q => q.OrderByDescending(x => x.Name));
     }
   }
 
 
-  public interface ITranslationsCollection : ICollectionBase<ITranslation>
+  public interface ITranslationsCollection : ICollectionBase<Translation>
   {
     /// <summary>
     /// Get a translated string by id
diff --git a/zero.Core/Collections/TreeCollectionBase.cs b/zero.Core/Collections/TreeCollectionBase.cs
deleted file mode 100644
index 71c51691..00000000
--- a/zero.Core/Collections/TreeCollectionBase.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using FluentValidation;
-using Raven.Client;
-using Raven.Client.Documents;
-using Raven.Client.Documents.Linq;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using zero.Core.Entities;
-using zero.Core.Extensions;
-
-namespace zero.Core.Collections
-{
-  public abstract class TreeCollectionBase<T> : CollectionBase<T>, ITreeCollectionBase<T>, IDisposable where T : IZeroEntity, ITreeEntity
-  {
-    public TreeCollectionBase(IZeroContext context, ICollectionInterceptorHandler interceptorHandler, IValidator<T> validator = null) : base(context, interceptorHandler, validator) { }
-
-
-    ///// <inheritdoc />
-    //public async Task<List<T>> GetHierarchy(string id)
-    //{
-    //  Categories_ByHierarchy.Result result = await Session.Query<Categories_ByHierarchy.Result, Categories_ByHierarchy>()
-    //    .ProjectInto<Categories_ByHierarchy.Result>()
-    //    .Include<Categories_ByHierarchy.Result, ICategory>(x => x.Path.Select(p => p.Id))
-    //    .FirstOrDefaultAsync(x => x.Id == id);
-
-    //  if (result == null)
-    //  {
-    //    return new();
-    //  }
-
-    //  return (await Session.LoadAsync<T>(result.Path.Select(x => x.Id))).Select(x => x.Value).ToList();
-    //}
-  }
-
-
-  public interface ITreeCollectionBase<T> : ICollectionBase<T> where T : IZeroEntity, ITreeEntity
-  {
-    ///// <summary>
-    ///// Get the tree hierarchy path for this entity
-    ///// </summary>
-    //Task<List<T>> GetHierarchy(string id);
-
-    ///// <summary>
-    ///// Update sorting of entities on a specific level
-    ///// </summary>
-    //Task<EntityResult<List<T>>> SaveSorting(string[] sortedIds);
-
-    ///// <summary>
-    ///// Move an entity to a new parent
-    ///// </summary>
-    //Task<EntityResult<T>> Move(string id, string parentId);
-
-    ///// <summary>
-    ///// Copies an entity to a new location
-    ///// </summary>
-    //Task<EntityResult<T>> Copy(string id, string destinationId, bool includeDescendants = false);
-  }
-}
diff --git a/zero.Core/Cultures/CultureResolver.cs b/zero.Core/Cultures/CultureResolver.cs
index df2978cd..bde2599a 100644
--- a/zero.Core/Cultures/CultureResolver.cs
+++ b/zero.Core/Cultures/CultureResolver.cs
@@ -33,11 +33,11 @@ namespace zero.Core.Cultures
       }
       else
       {
-        ILanguage language = await session.Query<ILanguage>().FirstOrDefaultAsync();
+        Language language = await session.Query<Language>().FirstOrDefaultAsync();
 
         if (language == null)
         {
-          Logger.LogWarning("Could not set request culture as there is no available ILanguage stored");
+          Logger.LogWarning("Could not set request culture as there is no available Language stored");
           return CultureInfo.CurrentCulture;
         }
 
@@ -50,7 +50,7 @@ namespace zero.Core.Cultures
         }
         catch (Exception ex)
         {
-          Logger.LogError(ex, "Could not create culture from ILanguage code {code}", language.Code);
+          Logger.LogError(ex, "Could not create culture from Language code {code}", language.Code);
           return CultureInfo.CurrentCulture;
         }
       }
diff --git a/zero.Core/Database/Indexes/MediaFolder_ByHierarchy.cs b/zero.Core/Database/Indexes/MediaFolder_ByHierarchy.cs
index 541f9cee..c5aac00d 100644
--- a/zero.Core/Database/Indexes/MediaFolder_ByHierarchy.cs
+++ b/zero.Core/Database/Indexes/MediaFolder_ByHierarchy.cs
@@ -6,12 +6,10 @@ using zero.Core.Entities;
 
 namespace zero.Core.Database.Indexes
 {
-  public class MediaFolder_ByHierarchy : AbstractIndexCreationTask<IMediaFolder, MediaFolder_ByHierarchy.Result>
+  public class MediaFolder_ByHierarchy : AbstractIndexCreationTask<MediaFolder, MediaFolder_ByHierarchy.Result>
   {
-    public class Result : IZeroIdEntity, IZeroDbConventions
+    public class Result : ZeroIdEntity, IZeroDbConventions
     {
-      public string Id { get; set; }
-
       public string Name { get; set; }
 
       public List<PathResult> Path { get; set; } = new List<PathResult>();
@@ -32,7 +30,7 @@ namespace zero.Core.Database.Indexes
       {
         Id = item.Id,
         Name = item.Name,
-        Path = Recurse(item, x => LoadDocument<IMediaFolder>(x.ParentId))
+        Path = Recurse(item, x => LoadDocument<MediaFolder>(x.ParentId))
                 .Where(x => x != null && x.Id != null && x.Id != item.Id)
                 .Reverse()
                 .Select(current => new PathResult()
diff --git a/zero.Core/Database/Indexes/MediaFolders_WithChildren.cs b/zero.Core/Database/Indexes/MediaFolders_WithChildren.cs
index 401fced8..cbc61d8c 100644
--- a/zero.Core/Database/Indexes/MediaFolders_WithChildren.cs
+++ b/zero.Core/Database/Indexes/MediaFolders_WithChildren.cs
@@ -7,10 +7,8 @@ namespace zero.Core.Database.Indexes
 {
   public class MediaFolders_WithChildren : AbstractIndexCreationTask<MediaFolder, MediaFolders_WithChildren.Result>
   {
-    public class Result : IZeroIdEntity, IZeroDbConventions
+    public class Result : ZeroIdEntity
     {
-      public string Id { get; set; }
-
       public string ParentId { get; set; }
 
       public string Name { get; set; }
diff --git a/zero.Core/Database/Indexes/Media_ByChildren.cs b/zero.Core/Database/Indexes/Media_ByChildren.cs
index 4abcfbae..ed35f963 100644
--- a/zero.Core/Database/Indexes/Media_ByChildren.cs
+++ b/zero.Core/Database/Indexes/Media_ByChildren.cs
@@ -6,10 +6,8 @@ namespace zero.Core.Database.Indexes
 {
   public class Media_ByChildren : AbstractMultiMapIndexCreationTask<Media_ByChildren.Result>
   {
-    public class Result : IZeroIdEntity, IZeroDbConventions
+    public class Result : ZeroIdEntity, IZeroDbConventions
     {
-      public string Id { get; set; }
-
       public string ParentId { get; set; }
 
       public int ChildrenCount { get; set; }
@@ -20,7 +18,7 @@ namespace zero.Core.Database.Indexes
 
     public Media_ByChildren()
     {
-      AddMap<IMedia>(items => items.Select(item => new Result()
+      AddMap<Media>(items => items.Select(item => new Result()
       {
         Id = item.Id,
         ParentId = item.FolderId,
@@ -28,7 +26,7 @@ namespace zero.Core.Database.Indexes
         ChildrenIds = new string[] { }
       }));
 
-      AddMap<IMediaFolder>(items => items.Select(item => new Result()
+      AddMap<MediaFolder>(items => items.Select(item => new Result()
       {
         Id = item.Id,
         ParentId = item.ParentId,
diff --git a/zero.Core/Database/Indexes/Media_ByParent.cs b/zero.Core/Database/Indexes/Media_ByParent.cs
index bc85474a..8081a42b 100644
--- a/zero.Core/Database/Indexes/Media_ByParent.cs
+++ b/zero.Core/Database/Indexes/Media_ByParent.cs
@@ -9,7 +9,7 @@ namespace zero.Core.Database.Indexes
   {
     public Media_ByParent()
     {
-      AddMap<IMediaFolder>(items => items.Select(item => new MediaListItem
+      AddMap<MediaFolder>(items => items.Select(item => new MediaListItem
       {
         Id = item.Id,
         ParentId = item.ParentId,
@@ -23,7 +23,7 @@ namespace zero.Core.Database.Indexes
         AspectRatio = 0
       }));
 
-      AddMap<IMedia>(items => items.Select(item => new MediaListItem
+      AddMap<Media>(items => items.Select(item => new MediaListItem
       {
         Id = item.Id,
         ParentId = item.FolderId,
diff --git a/zero.Core/Database/Indexes/Pages_AsHistory.cs b/zero.Core/Database/Indexes/Pages_AsHistory.cs
index 4b33053d..42a96a1b 100644
--- a/zero.Core/Database/Indexes/Pages_AsHistory.cs
+++ b/zero.Core/Database/Indexes/Pages_AsHistory.cs
@@ -6,12 +6,10 @@ using zero.Core.Entities;
 
 namespace zero.Core.Database.Indexes
 {
-  public class Pages_AsHistory : AbstractIndexCreationTask<IPage, Pages_AsHistory.Result>
+  public class Pages_AsHistory : AbstractIndexCreationTask<Page, Pages_AsHistory.Result>
   {
-    public class Result : IZeroIdEntity, IZeroDbConventions
+    public class Result : ZeroIdEntity, IZeroDbConventions
     {
-      public string Id { get; set; }
-
       public DateTimeOffset LastModified { get; set; }
     }
 
diff --git a/zero.Core/Database/Indexes/Pages_ByHierarchy.cs b/zero.Core/Database/Indexes/Pages_ByHierarchy.cs
index 1472c0dc..8e729893 100644
--- a/zero.Core/Database/Indexes/Pages_ByHierarchy.cs
+++ b/zero.Core/Database/Indexes/Pages_ByHierarchy.cs
@@ -8,10 +8,8 @@ namespace zero.Core.Database.Indexes
 {
   public class Pages_ByHierarchy : AbstractIndexCreationTask<Page, Pages_ByHierarchy.Result>
   {
-    public class Result : IZeroIdEntity, IZeroDbConventions
+    public class Result : ZeroIdEntity, IZeroDbConventions
     {
-      public string Id { get; set; }
-
       public string Name { get; set; }
 
       public List<PathResult> Path { get; set; } = new List<PathResult>();
diff --git a/zero.Core/Database/Indexes/Pages_WithChildren.cs b/zero.Core/Database/Indexes/Pages_WithChildren.cs
index 24d99d0b..30cec9a1 100644
--- a/zero.Core/Database/Indexes/Pages_WithChildren.cs
+++ b/zero.Core/Database/Indexes/Pages_WithChildren.cs
@@ -8,10 +8,8 @@ namespace zero.Core.Database.Indexes
 {
   public class Pages_WithChildren : AbstractIndexCreationTask<Page, Pages_WithChildren.Result>
   {
-    public class Result : IZeroIdEntity, IZeroDbConventions
+    public class Result : ZeroIdEntity, IZeroDbConventions
     {
-      public string Id { get; set; }
-
       public string ParentId { get; set; }
 
       public string Name { get; set; }
diff --git a/zero.Core/Database/Indexes/TreeEntity_ByPath.cs b/zero.Core/Database/Indexes/TreeEntity_ByPath.cs
index 3ef64fcd..0256f722 100644
--- a/zero.Core/Database/Indexes/TreeEntity_ByPath.cs
+++ b/zero.Core/Database/Indexes/TreeEntity_ByPath.cs
@@ -8,7 +8,7 @@
 //{
 //  public class TreeEntity_ByPath : AbstractIndexCreationTask<ITreeEntity, TreeEntity_ByPath.Result>
 //  {
-//    public class Result : IZeroIdEntity, IZeroDbConventions
+//    public class Result : ZeroIdEntity, IZeroDbConventions
 //    {
 //      public string Id { get; set; }
 
diff --git a/zero.Core/Database/ZeroDocumentConventionsBuilder.cs b/zero.Core/Database/ZeroDocumentConventionsBuilder.cs
index 58adbdf3..b5af6cb9 100644
--- a/zero.Core/Database/ZeroDocumentConventionsBuilder.cs
+++ b/zero.Core/Database/ZeroDocumentConventionsBuilder.cs
@@ -42,7 +42,7 @@ namespace zero.Core.Database
       conventions.IdentityPartsSeparator = IdentityPartsSeparator;
       conventions.TransformTypeCollectionNameToDocumentIdPrefix = TransformTypeCollectionNameToDocumentIdPrefix;
       conventions.FindCollectionName = FindCollectionName;
-      conventions.RegisterAsyncIdConvention<IZeroEntity>((_, entity) => GetDocumentId(conventions, entity));
+      conventions.RegisterAsyncIdConvention<ZeroEntity>((_, entity) => GetDocumentId(conventions, entity));
 
       ConfigureJsonSerializer(conventions.Serialization);
     }
diff --git a/zero.Core/Entities/Applications/Application.cs b/zero.Core/Entities/Applications/Application.cs
index cf64d74d..61e565ce 100644
--- a/zero.Core/Entities/Applications/Application.cs
+++ b/zero.Core/Entities/Applications/Application.cs
@@ -7,68 +7,43 @@ namespace zero.Core.Entities
   /// <summary>
   /// An application is a website. zero can host multiple websites at once which share common assets
   /// </summary>
-  public class Application : ZeroEntity, IApplication
-  {
-    /// <inheritdoc />
-    public string Database { get; set; }
-
-    /// <inheritdoc />
-    public string FullName { get; set; }
-
-    /// <inheritdoc />
-    public string Email { get; set; }
-
-    /// <inheritdoc />
-    public string ImageId { get; set; }
-
-    /// <inheritdoc />
-    public string IconId { get; set; }
-
-    /// <inheritdoc />
-    public Uri[] Domains { get; set; } = new Uri[] { };
-
-    /// <inheritdoc />
-    public List<string> Features { get; set; } = new List<string>();
-  }
-
-
   [Collection("Applications")]
-  public interface IApplication : IZeroEntity, IZeroDbConventions
+  public class Application : ZeroEntity
   {
     /// <summary>
     /// Raven database name for application data
     /// </summary>
-    string Database { get; set; }
+    public string Database { get; set; }
 
     /// <summary>
     /// Full company or product name
     /// </summary>
-    string FullName { get; set; }
+    public string FullName { get; set; }
 
     /// <summary>
     /// Generic contact email. Can be used in various locations
     /// </summary>
-    string Email { get; set; }
+    public string Email { get; set; }
 
     /// <summary>
     /// Image of the application
     /// </summary>
-    string ImageId { get; set; }
+    public string ImageId { get; set; }
 
     /// <summary>
     /// Simple image of the application (can be used as favicon)
     /// </summary>
-    string IconId { get; set; }
+    public string IconId { get; set; }
 
     /// <summary>
     /// All assigned domains for this application
     /// </summary>
-    Uri[] Domains { get; set; }
+    public Uri[] Domains { get; set; } = Array.Empty<Uri>();
 
     /// <summary>
     /// Features which are enabled for this application.
     /// Can be user-defined and affect both backoffice and frontend
     /// </summary>
-    List<string> Features { get; set; }
+    public List<string> Features { get; set; } = new();
   }
 }
\ No newline at end of file
diff --git a/zero.Core/Entities/Country.cs b/zero.Core/Entities/Country.cs
index 79e668f2..d80547a4 100644
--- a/zero.Core/Entities/Country.cs
+++ b/zero.Core/Entities/Country.cs
@@ -1,28 +1,15 @@
-using zero.Core.Attributes;
-
-namespace zero.Core.Entities
+namespace zero.Core.Entities
 {
-  public class Country : ZeroEntity, ICountry
-  {
-    /// <inheritdoc />
-    public bool IsPreferred { get; set; }
-
-    /// <inheritdoc />
-    public string Code { get; set; }
-  }
-
-
-  [Collection("Countries")]
-  public interface ICountry : IZeroEntity, IZeroDbConventions
+  public class Country : ZeroEntity
   {
     /// <summary>
     /// Preferred countries are displayed on top in lists
     /// </summary>
-    bool IsPreferred { get; set; }
+    public bool IsPreferred { get; set; }
 
     /// <summary>
     /// Country code (ISO 3166-1)
     /// </summary>
-    string Code { get; set; }
+    public string Code { get; set; }
   }
 }
diff --git a/zero.Core/Entities/Features/Feature.cs b/zero.Core/Entities/Features/Feature.cs
index 7e249bf2..3b5238ef 100644
--- a/zero.Core/Entities/Features/Feature.cs
+++ b/zero.Core/Entities/Features/Feature.cs
@@ -1,15 +1,23 @@
 namespace zero.Core.Entities
 {
-  /// <inheritdoc />
-  public class Feature : IFeature
+  /// <summary>
+  /// A feature can affect both the backoffice and the frontend
+  /// </summary>
+  public class Feature
   {
-    /// <inheritdoc />
+    /// <summary>
+    /// The alias
+    /// </summary>
     public string Alias { get; set; }
 
-    /// <inheritdoc />
+    /// <summary>
+    /// The name of the feature
+    /// </summary>
     public string Name { get; set; }
 
-    /// <inheritdoc />
+    /// <summary>
+    /// Additional description
+    /// </summary>
     public string Description { get; set; }
   }
 }
diff --git a/zero.Core/Entities/Features/IFeature.cs b/zero.Core/Entities/Features/IFeature.cs
deleted file mode 100644
index 4c6f8ef2..00000000
--- a/zero.Core/Entities/Features/IFeature.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace zero.Core.Entities
-{
-  /// <summary>
-  /// A feature can affect both the backoffice and the frontend
-  /// </summary>
-  public interface IFeature
-  {
-    /// <summary>
-    /// The alias
-    /// </summary>
-    string Alias { get; }
-
-    /// <summary>
-    /// The name of the feature
-    /// </summary>
-    string Name { get; }
-
-    /// <summary>
-    /// Additional description
-    /// </summary>
-    string Description { get; }
-  }
-}
diff --git a/zero.Core/Entities/IAppAwareEntity.cs b/zero.Core/Entities/IAppAwareEntity.cs
deleted file mode 100644
index 12fef12a..00000000
--- a/zero.Core/Entities/IAppAwareEntity.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace zero.Core.Entities
-{
-  /// <summary>
-  /// By default most entities are app aware and stored in their own database context.
-  /// Exceptions (like media) are stored in the core database and need to be marked as app aware
-  /// </summary>
-  public interface IAppAwareEntity
-  {
-    /// <summary>
-    /// Associated app id of the entity
-    /// </summary>
-    string AppId { get; set; }
-  }
-}
diff --git a/zero.Core/Entities/IExportConfig.cs b/zero.Core/Entities/IExportConfig.cs
deleted file mode 100644
index 9d692f44..00000000
--- a/zero.Core/Entities/IExportConfig.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace zero.Core.Entities
-{
-  public interface IExportConfig
-  {
-  }
-}
diff --git a/zero.Core/Entities/ILanguageAwareEntity.cs b/zero.Core/Entities/ILanguageAwareEntity.cs
deleted file mode 100644
index 3f22c487..00000000
--- a/zero.Core/Entities/ILanguageAwareEntity.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace zero.Core.Entities
-{
-  public interface ILanguageAwareEntity
-  {
-    ///// <summary>
-    ///// Contains the parent entity in case this is a language variant
-    ///// </summary>
-    //public string ParentEntityId { get; set; }
-
-    /// <summary>
-    /// Language of the entity
-    /// </summary>
-    string LanguageId { get; set; }
-  }
-}
diff --git a/zero.Core/Entities/ITreeEntity.cs b/zero.Core/Entities/ITreeEntity.cs
deleted file mode 100644
index 0ce9fc19..00000000
--- a/zero.Core/Entities/ITreeEntity.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace zero.Core.Entities
-{
-  public interface ITreeEntity : IZeroEntity
-  {
-    /// <summary>
-    /// Id of the parent entity
-    /// </summary>
-    string ParentId { get; set; }
-  }
-}
diff --git a/zero.Core/Entities/IZeroConfigEntity.cs b/zero.Core/Entities/IZeroConfigEntity.cs
deleted file mode 100644
index d10906ab..00000000
--- a/zero.Core/Entities/IZeroConfigEntity.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace zero.Core.Entities
-{
-  public interface IZeroConfigEntity : IZeroEntity
-  {
-    /// <summary>
-    /// Alias of the used type
-    /// </summary>
-    string TypeAlias { get; set; }
-  }
-}
diff --git a/zero.Core/Entities/IZeroIdEntity.cs b/zero.Core/Entities/IZeroIdEntity.cs
deleted file mode 100644
index 5ae75b7d..00000000
--- a/zero.Core/Entities/IZeroIdEntity.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace zero.Core.Entities
-{
-  public interface IZeroIdEntity
-  {
-    /// <summary>
-    /// Id of the entity
-    /// </summary>
-    string Id { get; set; }
-  }
-}
\ No newline at end of file
diff --git a/zero.Core/Entities/IZeroInternal.cs b/zero.Core/Entities/IZeroInternal.cs
deleted file mode 100644
index 40886856..00000000
--- a/zero.Core/Entities/IZeroInternal.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace zero.Core.Entities
-{
-  public interface IZeroInternal
-  {
-  }
-}
diff --git a/zero.Core/Entities/IconSet.cs b/zero.Core/Entities/IconSet.cs
index 3f667aa6..a3dcec95 100644
--- a/zero.Core/Entities/IconSet.cs
+++ b/zero.Core/Entities/IconSet.cs
@@ -1,44 +1,28 @@
 namespace zero.Core.Entities
 {
-  /// <inheritdoc />
-  public class IconSet : IIconSet
-  {
-    /// <inheritdoc />
-    public string Alias { get; set; }
-
-    /// <inheritdoc />
-    public string Name { get; set; }
-
-    /// <inheritdoc />
-    public string Prefix { get; set; }
-
-    /// <inheritdoc />
-    public string SpritePath { get; set; }
-  }
-
   /// <summary>
   /// Define a backoffice icon set
   /// </summary>
-  public interface IIconSet
+  public class IconSet
   {
     /// <summary>
     /// The alias
     /// </summary>
-    string Alias { get; }
+    public string Alias { get; set; }
 
     /// <summary>
     /// Name of the icon set
     /// </summary>
-    string Name { get; }
+    public string Name { get; set; }
 
     /// <summary>
     /// Prefix for addressing symbols (by default the alias)
     /// </summary>
-    string Prefix { get; }
+    public string Prefix { get; set; }
 
     /// <summary>
     /// Path to the SVG sprite
     /// </summary>
-    string SpritePath { get; }
+    public string SpritePath { get; set; }
   }
 }
diff --git a/zero.Core/Entities/InheritAttribute.cs b/zero.Core/Entities/InheritAttribute.cs
deleted file mode 100644
index 8b1e17c2..00000000
--- a/zero.Core/Entities/InheritAttribute.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-
-namespace zero.Core.Entities
-{
-  public class OverwriteAttribute : Attribute
-  {
-  }
-
-
-  public class ReferenceAttribute : Attribute
-  {
-    public Type Type { get; set; }
-
-    public ReferenceAttribute(Type type)
-    {
-      Type = type;
-    }
-  }
-}
\ No newline at end of file
diff --git a/zero.Core/Entities/Language.cs b/zero.Core/Entities/Language.cs
index 52f0b93b..63aa61ce 100644
--- a/zero.Core/Entities/Language.cs
+++ b/zero.Core/Entities/Language.cs
@@ -2,42 +2,27 @@
 
 namespace zero.Core.Entities
 {
-  public class Language : ZeroEntity, ILanguage
-  {
-    /// <inheritdoc />
-    public string Code { get; set; }
-
-    /// <inheritdoc />
-    public bool IsDefault { get; set; }
-
-    /// <inheritdoc />
-    public bool IsOptional { get; set; }
-
-    /// <inheritdoc />
-    public string InheritedLanguageId { get; set; }
-  }
-
   [Collection("Languages")]
-  public interface ILanguage : IZeroEntity, IZeroDbConventions
+  public class Language : ZeroEntity
   {
     /// <summary>
     /// Language code (ISO 3166-1)
     /// </summary>
-    string Code { get; set; }
+    public string Code { get; set; }
 
     /// <summary>
     /// Whether this is the default language
     /// </summary>
-    bool IsDefault { get; set; }
+    public bool IsDefault { get; set; }
 
     /// <summary>
     /// Whether this language is optional and does not have to be filled out
     /// </summary>
-    bool IsOptional { get; set; }
+    public bool IsOptional { get; set; }
 
     /// <summary>
     /// If this language is inherited it gets all missing properties from its parent
     /// </summary>
-    string InheritedLanguageId { get; set; }
+    public string InheritedLanguageId { get; set; }
   }
 }
\ No newline at end of file
diff --git a/zero.Core/Entities/LanguageVariant.cs b/zero.Core/Entities/LanguageVariant.cs
deleted file mode 100644
index 1a328843..00000000
--- a/zero.Core/Entities/LanguageVariant.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace zero.Core.Entities
-{
-  public class LanguageVariant
-  {
-    public string LanguageId { get; set; }
-
-    public string Name { get; set; }
-
-    public bool HideEntity { get; set; }
-  }
-
-
-  public interface ILanguageVariant
-  {
-    string LanguageId { get; set; }
-  }
-}
diff --git a/zero.Core/Entities/Links/Link.cs b/zero.Core/Entities/Links/Link.cs
index c8d7285e..c3a1271c 100644
--- a/zero.Core/Entities/Links/Link.cs
+++ b/zero.Core/Entities/Links/Link.cs
@@ -1,10 +1,9 @@
 using Newtonsoft.Json;
-using System;
 using System.Collections.Generic;
 
 namespace zero.Core.Entities
 {
-  public class Link : ILink
+  public class Link
   {
     public string Area { get; set; }
 
@@ -16,7 +15,10 @@ namespace zero.Core.Entities
 
     public Dictionary<string, object> Values { get; set; } = new();
 
-    /// <inheritdoc />
+    /// <summary>
+    /// [Warning] This field is always empty when bound to the database.
+    /// It is only filled in the app-code for routing.
+    /// </summary>
     [JsonIgnore]
     public string Url { get; set; }
   }
@@ -27,25 +29,4 @@ namespace zero.Core.Entities
     Self = 1,
     Blank = 2
   }
-
-
-  public interface ILink
-  {
-    string Area { get; set; }
-
-    LinkTarget Target { get; set; }
-
-    string UrlSuffix { get; set; }
-
-    string Title { get; set; }
-
-    Dictionary<string, object> Values { get; set; }
-
-    /// <summary>
-    /// [Warning] This field is always empty when bound to the database.
-    /// It is only filled in the app-code for routing.
-    /// </summary>
-    [JsonIgnore]
-    public string Url { get; set; }
-  }
 }
diff --git a/zero.Core/Entities/Links/LinkArea.cs b/zero.Core/Entities/Links/LinkArea.cs
deleted file mode 100644
index c2c70f0b..00000000
--- a/zero.Core/Entities/Links/LinkArea.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-//using System;
-//using System.Collections.Generic;
-//using System.Linq;
-//using System.Text;
-//using System.Threading.Tasks;
-
-//namespace zero.Core.Entities
-//{
-//  /// <inheritdoc />
-//  public class LinkArea : ILinkArea
-//  {
-//    /// <inheritdoc />
-//    public string Alias { get; set; }
-
-//    /// <inheritdoc />
-//    public string Name { get; set; }
-
-//    /// <inheritdoc />
-//    public string Icon { get; set; }
-
-//    /// <summary>
-//    /// HEX color (#aabbcc or #abc). Defaults to a neutral color
-//    /// </summary>
-//    public string Color { get; set; }
-
-//    /// <inheritdoc />
-//    public IList<IChildSection> Children { get; } = new List<IChildSection>();
-
-
-//    public LinkArea() { }
-
-//    public LinkArea(string alias, string name, string icon = null, string color = null)
-//    {
-//      Alias = alias;
-//      Name = name;
-//      Icon = icon;
-//      Color = color;
-//    }
-//  }
-
-
-//  /// <summary>
-//  /// A section is a main part of the backoffice application
-//  /// </summary>
-//  public interface ILinkArea
-//  {
-//    /// <summary>
-//    /// The section alias which acts as the url slug for navigation
-//    /// </summary>
-//    string Alias { get; }
-
-//    /// <summary>
-//    /// The name of the section (either a string or a translation key with @ prefix)
-//    /// </summary>
-//    string Name { get; }
-
-//    /// <summary>
-//    /// Icon of the section
-//    /// </summary>
-//    string Icon { get; }
-
-//    /// <summary>
-//    /// HEX color (#aabbcc or #abc)
-//    /// </summary>
-//    string Color { get; }
-
-//    /// <summary>
-//    /// Children are displayed as a sub-navigation in the main nav area
-//    /// </summary>
-//    IList<IChildSection> Children { get; }
-//  }
-//}
diff --git a/zero.Core/Entities/MailTemplate.cs b/zero.Core/Entities/MailTemplate.cs
index 64f6e821..30aa4510 100644
--- a/zero.Core/Entities/MailTemplate.cs
+++ b/zero.Core/Entities/MailTemplate.cs
@@ -1,77 +1,48 @@
 using zero.Core.Attributes;
-using zero.Core.Entities;
 
 namespace zero.Core.Entities
 {
-  public class MailTemplate : ZeroEntity, IMailTemplate
-  {
-    /// <inheritdoc />
-    public string SenderEmail { get; set; }
-
-    /// <inheritdoc />
-    public string SenderName { get; set; }
-
-    /// <inheritdoc />
-    public string RecipientEmail { get; set; }
-
-    /// <inheritdoc />
-    public string Cc { get; set; }
-
-    /// <inheritdoc />
-    public string Bcc { get; set; }
-
-    /// <inheritdoc />
-    public string Subject { get; set; }
-
-    /// <inheritdoc />
-    public string Body { get; set; }
-
-    /// <inheritdoc />
-    public string Preheader { get; set; }
-  }
-
-
   [Collection("MailTemplates")]
-  public interface IMailTemplate : IZeroEntity, IZeroDbConventions
+  public class MailTemplate : ZeroEntity
   {
     /// <summary>
     /// Email address of the sender (overrides email from application)
     /// </summary>
-    string SenderEmail { get; set; }
+    public string SenderEmail { get; set; }
 
     /// <summary>
     /// Name of the sender (overrides name from application)
     /// </summary>
-    string SenderName { get; set; }
+    public string SenderName { get; set; }
 
     /// <summary>
     /// Email address of the recipient. This is only necessary for templates which do not have a dynamic recipient (e.g. reports).
     /// </summary>
-    string RecipientEmail { get; set; }
+    public string RecipientEmail { get; set; }
 
     /// <summary>
     /// Additional comma-separated emails to send a copy to
     /// </summary>
-    string Cc { get; set; }
+    public string Cc { get; set; }
 
     /// <summary>
     /// Additional comma-separated emails to send a hidden copy to
     /// </summary>
-    string Bcc { get; set; }
+    public string Bcc { get; set; }
 
     /// <summary>
     /// Email subject (can contain placeholders)
     /// </summary>
-    string Subject { get; set; }
+    public string Subject { get; set; }
 
     /// <summary>
     /// Email body (can contain placeholders)
     /// </summary>
-    string Body { get; set; }
+    public string Body { get; set; }
 
     /// <summary>
     /// Preheader which is displayed in the preview pane (can contain placeholders)
     /// </summary>
-    string Preheader { get; set; }
+    public string Preheader { get; set; }
   }
 }
\ No newline at end of file
diff --git a/zero.Core/Entities/Media/Media.cs b/zero.Core/Entities/Media/Media.cs
index ee870bde..d8de19a4 100644
--- a/zero.Core/Entities/Media/Media.cs
+++ b/zero.Core/Entities/Media/Media.cs
@@ -1,54 +1,12 @@
-using System;
-using zero.Core.Attributes;
+using zero.Core.Attributes;
 
 namespace zero.Core.Entities
 {
-  /// <inheritdoc />
-  public class Media : ZeroEntity, IMedia
-  {
-    /// <inheritdoc />
-    public string AppId { get; set; }
-
-    /// <inheritdoc />
-    public string FileId { get; set; }
-
-    /// <inheritdoc />
-    public string FolderId { get; set; }
-
-    /// <inheritdoc />
-    public string AlternativeText { get; set; }
-
-    /// <inheritdoc />
-    public string Caption { get; set; }
-
-    /// <inheritdoc />
-    public string Source { get; set; }
-
-    /// <inheritdoc />
-    public string ThumbnailSource { get; set; }
-
-    /// <inheritdoc />
-    public string PreviewSource { get; set; }
-
-    /// <inheritdoc />
-    public long Size { get; set; }
-
-    /// <inheritdoc />
-    public MediaImageMeta ImageMeta { get; set; }
-
-    /// <inheritdoc />
-    public MediaFocalPoint FocalPoint { get; set; }
-
-    /// <inheritdoc />
-    public MediaType Type { get; set; }
-  }
-
-
   /// <summary>
   /// A media file (can contain an image or other media like videos and documents)
   /// </summary>
   [Collection("Media")]
-  public interface IMedia : IZeroEntity, IZeroDbConventions, IAppAwareEntity
+  public class Media : ZeroEntity
   {
     /// <summary>
     /// Id/name of the phyiscal folder which is stored on disk/cloud
@@ -63,46 +21,46 @@ namespace zero.Core.Entities
     /// <summary>
     /// Alternative text which is used when the image can't be loaded
     /// </summary>
-    string AlternativeText { get; set; }
+    public string AlternativeText { get; set; }
 
     /// <summary>
     /// Additional caption text
     /// </summary>
-    string Caption { get; set; }
+    public string Caption { get; set; }
 
     /// <summary>
     /// Path of the media item
     /// </summary>
-    string Source { get; set; }
+    public string Source { get; set; }
 
     /// <summary>
     /// For images this is the source for a 100x100px thumbnail
     /// </summary>
-    string ThumbnailSource { get; set; }
+    public string ThumbnailSource { get; set; }
 
     /// <summary>
     /// For images this is the source for a [proportional]x210px thumbnail
     /// </summary>
-    string PreviewSource { get; set; }
+    public string PreviewSource { get; set; }
 
     /// <summary>
     /// Filesize in bytes
     /// </summary>
-    long Size { get; set; }
+    public long Size { get; set; }
 
     /// <summary>
     /// Meta data for images
     /// </summary>
-    MediaImageMeta ImageMeta { get; set; }
+    public MediaImageMeta ImageMeta { get; set; }
 
     /// <summary>
     /// Optional focal point for an image
     /// </summary>
-    MediaFocalPoint FocalPoint { get; set; }
+    public MediaFocalPoint FocalPoint { get; set; }
 
     /// <summary>
     /// Type of the media
     /// </summary>
-    MediaType Type { get; set; }
+    public MediaType Type { get; set; }
   }
 }
diff --git a/zero.Core/Entities/Media/MediaFolder.cs b/zero.Core/Entities/Media/MediaFolder.cs
index 70b8d7dd..e92bda9f 100644
--- a/zero.Core/Entities/Media/MediaFolder.cs
+++ b/zero.Core/Entities/Media/MediaFolder.cs
@@ -2,26 +2,15 @@
 
 namespace zero.Core.Entities
 {
-  /// <inheritdoc />
-  public class MediaFolder : ZeroEntity, IMediaFolder
-  {
-    /// <inheritdoc />
-    public string AppId { get; set; }
-
-    /// <inheritdoc />
-    public string ParentId { get; set; }
-  }
-
-
   /// <summary>
   /// A media folder contains media and other folders
   /// </summary>
   [Collection("MediaFolders")]
-  public interface IMediaFolder : IZeroEntity, IZeroDbConventions, IAppAwareEntity
+  public class MediaFolder : ZeroEntity
   {
     /// <summary>
     /// Parent folder id
     /// </summary>
-    string ParentId { get; set; }
+    public string ParentId { get; set; }
   }
 }
\ No newline at end of file
diff --git a/zero.Core/Entities/Media/MediaListItem.cs b/zero.Core/Entities/Media/MediaListItem.cs
index b7d1cfde..c812073d 100644
--- a/zero.Core/Entities/Media/MediaListItem.cs
+++ b/zero.Core/Entities/Media/MediaListItem.cs
@@ -2,10 +2,8 @@
 
 namespace zero.Core.Entities
 {
-  public class MediaListItem : IZeroIdEntity, IZeroDbConventions
+  public class MediaListItem : ZeroIdEntity
   {
-    public string Id { get; set; }
-
     public string ParentId { get; set; }
 
     public string Name { get; set; }
diff --git a/zero.Core/Entities/Media/MediaListQuery.cs b/zero.Core/Entities/Media/MediaListQuery.cs
index 3e48046e..c36f07f5 100644
--- a/zero.Core/Entities/Media/MediaListQuery.cs
+++ b/zero.Core/Entities/Media/MediaListQuery.cs
@@ -1,6 +1,6 @@
 namespace zero.Core.Entities
 {
-  public class MediaListQuery : ListQuery<IMedia>
+  public class MediaListQuery : ListQuery<Media>
   {
     public string FolderId { get; set; }
   }
diff --git a/zero.Core/Entities/Modules/Module.cs b/zero.Core/Entities/Modules/Module.cs
index 3cbbf91a..b91a6cee 100644
--- a/zero.Core/Entities/Modules/Module.cs
+++ b/zero.Core/Entities/Modules/Module.cs
@@ -1,42 +1,24 @@
-using System;
-
-namespace zero.Core.Entities
+namespace zero.Core.Entities
 {
   /// <summary>
   /// A module can consist of unlimited properties and be rendered as you wish
   /// The backoffice rendering is done by an IRenderer
   /// </summary>
-  public class Module : IModule
-  {
-    /// <inheritdoc />
-    public string Id { get; set; }
-
-    /// <inheritdoc />
-    public uint Sort { get; set; }
-
-    /// <inheritdoc />
-    public bool IsActive { get; set; }
-
-    /// <inheritdoc />
-    public string ModuleTypeAlias { get; set; }
-  }
-
-
-  public interface IModule : IZeroIdEntity
+  public class Module : ZeroIdEntity
   {
     /// <summary>
     /// Sort order
     /// </summary>
-    uint Sort { get; set; }
+    public uint Sort { get; set; }
 
     /// <summary>
     /// Whether the module is visible in the frontend
     /// </summary>
-    bool IsActive { get; set; }
+    public bool IsActive { get; set; }
 
     /// <summary>
     /// Alias of the used module type
     /// </summary>
-    string ModuleTypeAlias { get; set; }
+    public string ModuleTypeAlias { get; set; }
   }
 }
\ No newline at end of file
diff --git a/zero.Core/Entities/Pages/Page.cs b/zero.Core/Entities/Pages/Page.cs
index 2414dfde..c136e3be 100644
--- a/zero.Core/Entities/Pages/Page.cs
+++ b/zero.Core/Entities/Pages/Page.cs
@@ -7,46 +7,30 @@ namespace zero.Core.Entities
   /// A page can consist of unlimited properties and be rendered as you wish
   /// The backoffice rendering is done by an IRenderer
   /// </summary>
-  public class Page : ZeroEntity, IPage
+  [Collection("Pages")]
+  public class Page : ZeroEntity
   {
-    /// <inheritdoc />
+    /// <summary>
+    /// Use this field (when filled out) instead of the alias for URL generation
+    /// </summary>
     public string UrlAlias { get; set; }
 
     /// <inheritdoc />
     public string ParentId { get; set; }
 
-    /// <inheritdoc />
-    public string PageTypeAlias { get; set; }
-
-    /// <inheritdoc />
-    public DateTimeOffset? PublishDate { get; set; }
-
-    /// <inheritdoc />
-    public DateTimeOffset? UnpublishDate { get; set; }
-  }
-
-
-  [Collection("Pages")]
-  public interface IPage : IZeroEntity, IZeroDbConventions, ITreeEntity
-  {
-    /// <summary>
-    /// Use this field (when filled out) instead of the alias for URL generation
-    /// </summary>
-    string UrlAlias { get; set; }
-
     /// <summary>
     /// Alias of the used page type
     /// </summary>
-    string PageTypeAlias { get; set; }
+    public string PageTypeAlias { get; set; }
 
     /// <summary>
     /// Date when the page is published
     /// </summary>
-    DateTimeOffset? PublishDate { get; set; }
+    public DateTimeOffset? PublishDate { get; set; }
 
     /// <summary>
     /// Date when the page is unpublished
     /// </summary>
-    DateTimeOffset? UnpublishDate { get; set; }
+    public DateTimeOffset? UnpublishDate { get; set; }
   }
 }
\ No newline at end of file
diff --git a/zero.Core/Entities/Preset.cs b/zero.Core/Entities/Preset.cs
index 9d7a83b3..e764af60 100644
--- a/zero.Core/Entities/Preset.cs
+++ b/zero.Core/Entities/Preset.cs
@@ -3,50 +3,31 @@ using zero.Core.Attributes;
 
 namespace zero.Core.Entities
 {
-  public abstract class Preset : IPreset
-  {
-    /// <inheritdoc />
-    public string Key { get; set; }
-
-    /// <inheritdoc />
-    public string Name { get; set; }
-  }
-
-  public interface IPreset
+  public abstract class Preset
   {
     /// <summary>
     /// Key is used to query a preset
     /// </summary>
-    string Key { get; set; }
+    public string Key { get; set; }
 
     /// <summary>
     /// Name of the preset
     /// </summary>
-    string Name { get; set; }
-  }
-
-
-  public class PresetOverride<T> : ZeroEntity, IPresetOverride<T> where T : IPreset
-  {
-    /// <inheritdoc />
-    public Type TargetType { get; set; }
-
-    /// <inheritdoc />
-    public T Model { get; set; }
+    public string Name { get; set; }
   }
 
 
   [Collection("Presets")]
-  public interface IPresetOverride<T> : IZeroEntity, IZeroDbConventions where T : IPreset
+  public class PresetOverride<T> : ZeroEntity where T : Preset
   {
     /// <summary>
     /// Type of the target model (used to query)
     /// </summary>
-    Type TargetType { get; set; }
+    public Type TargetType { get; set; }
 
     /// <summary>
     /// Overridden data
     /// </summary>
-    T Model { get; set; }
+    public T Model { get; set; }
   }
 }
diff --git a/zero.Core/Entities/Preview.cs b/zero.Core/Entities/Preview.cs
index a88a5250..a8ff2346 100644
--- a/zero.Core/Entities/Preview.cs
+++ b/zero.Core/Entities/Preview.cs
@@ -2,27 +2,17 @@
 
 namespace zero.Core.Entities
 {
-  public class Preview : ZeroEntity, IPreview
-  {
-    /// <inheritdoc />
-    public string OriginalId { get; set; }
-
-    /// <inheritdoc />
-    public IZeroEntity Content { get; set; }
-  }
-
-
   [Collection("Previews")]
-  public interface IPreview : IZeroEntity, IZeroDbConventions
+  public class Preview : ZeroEntity
   {
     /// <summary>
     /// Id of the original entity
     /// </summary>
-    string OriginalId { get; set; }
+    public string OriginalId { get; set; }
 
     /// <summary>
     /// Contains the entity content
     /// </summary>
-    IZeroEntity Content { get; set; }
+    public ZeroEntity Content { get; set; }
   }
 }
diff --git a/zero.Core/Entities/RecycleBin/RecycleBinListQuery.cs b/zero.Core/Entities/RecycleBin/RecycleBinListQuery.cs
index 852871be..2abe5dbf 100644
--- a/zero.Core/Entities/RecycleBin/RecycleBinListQuery.cs
+++ b/zero.Core/Entities/RecycleBin/RecycleBinListQuery.cs
@@ -1,6 +1,6 @@
 namespace zero.Core.Entities
 {
-  public class RecycleBinListQuery : ListQuery<IRecycledEntity>
+  public class RecycleBinListQuery : ListQuery<RecycledEntity>
   {
     public string Group { get; set; }
 
diff --git a/zero.Core/Entities/RecycleBin/RecycledEntity.cs b/zero.Core/Entities/RecycleBin/RecycledEntity.cs
index 34d8026c..4ceb0084 100644
--- a/zero.Core/Entities/RecycleBin/RecycledEntity.cs
+++ b/zero.Core/Entities/RecycleBin/RecycledEntity.cs
@@ -2,43 +2,27 @@
 
 namespace zero.Core.Entities
 {
-  public class RecycledEntity : ZeroEntity, IRecycledEntity
-  {
-    /// <inheritdoc />
-    public string OriginalId { get; set; }
-
-    /// <inheritdoc />
-    public string OperationId { get; set; }
-
-    /// <inheritdoc />
-    public string Group { get; set; }
-
-    /// <inheritdoc />
-    public IZeroEntity Content { get; set; }
-  }
-
-
   [Collection("RecycleBin")]
-  public interface IRecycledEntity : IZeroEntity, IZeroDbConventions
+  public class RecycledEntity : ZeroEntity
   {
     /// <summary>
     /// Id of the recycled entity
     /// </summary>
-    string OriginalId { get; set; }
+    public string OriginalId { get; set; }
 
     /// <summary>
     /// Group recycled entities together which have been recycled in a single operation
     /// </summary>
-    string OperationId { get; set; }
+    public string OperationId { get; set; }
 
     /// <summary>
     /// Contains the entity content
     /// </summary>
-    IZeroEntity Content { get; set; }
+    public ZeroEntity Content { get; set; }
 
     /// <summary>
     /// Recycled entities can be grouped together (e.g. pages, media, ...)
     /// </summary>
-    string Group { get; set; }
+    public string Group { get; set; }
   }
 }
diff --git a/zero.Core/Entities/Refs/Ref.cs b/zero.Core/Entities/Refs/Ref.cs
index 48c3478e..2934ad5f 100644
--- a/zero.Core/Entities/Refs/Ref.cs
+++ b/zero.Core/Entities/Refs/Ref.cs
@@ -1,6 +1,6 @@
 namespace zero.Core.Entities
 {
-  public class Ref<T> : Ref where T : IZeroIdEntity
+  public class Ref<T> : Ref where T : ZeroIdEntity
   {
     public Ref() : base() { }
     public Ref(string id) : base(id) { }
diff --git a/zero.Core/Entities/Refs/ValueRef.cs b/zero.Core/Entities/Refs/ValueRef.cs
index b3782db8..dec86607 100644
--- a/zero.Core/Entities/Refs/ValueRef.cs
+++ b/zero.Core/Entities/Refs/ValueRef.cs
@@ -1,6 +1,6 @@
 namespace zero.Core.Entities
 {
-  public class ValueRef<T> : ValueRef<T, string> where T : IZeroIdEntity
+  public class ValueRef<T> : ValueRef<T, string> where T : ZeroIdEntity
   {
     public ValueRef() : base() { }
     public ValueRef(string id, string value) : base(id, value) { }
@@ -9,7 +9,7 @@
   }
 
 
-  public class ValueRef<TEntity, TValue> : Ref where TEntity : IZeroIdEntity
+  public class ValueRef<TEntity, TValue> : Ref where TEntity : ZeroIdEntity
   {
     public ValueRef() : base() { }
     public ValueRef(string id, TValue value) : base(id)
diff --git a/zero.Core/Entities/Sections/ISection.cs b/zero.Core/Entities/Sections/ISection.cs
index 4c32cc49..66a3e665 100644
--- a/zero.Core/Entities/Sections/ISection.cs
+++ b/zero.Core/Entities/Sections/ISection.cs
@@ -2,6 +2,11 @@
 
 namespace zero.Core.Entities
 {
+  /// <summary>
+  /// Internal section
+  /// </summary>
+  public interface IInternalSection : ISection { }
+
   /// <summary>
   /// A section is a main part of the backoffice application
   /// </summary>
diff --git a/zero.Core/Entities/Settings/SettingsArea.cs b/zero.Core/Entities/Settings/SettingsArea.cs
index f1e7adb3..b95b7c9d 100644
--- a/zero.Core/Entities/Settings/SettingsArea.cs
+++ b/zero.Core/Entities/Settings/SettingsArea.cs
@@ -38,7 +38,7 @@
   }
 
 
-  public class InternalSettingsArea : SettingsArea, IZeroInternal
+  public class InternalSettingsArea : SettingsArea
   {
     public InternalSettingsArea() { }
     public InternalSettingsArea(string alias, string name, string description = null, string icon = null) : base(alias, name, description, icon) { }
diff --git a/zero.Core/Entities/Settings/SettingsGroup.cs b/zero.Core/Entities/Settings/SettingsGroup.cs
index a46b2c89..2af7d501 100644
--- a/zero.Core/Entities/Settings/SettingsGroup.cs
+++ b/zero.Core/Entities/Settings/SettingsGroup.cs
@@ -2,6 +2,8 @@
 
 namespace zero.Core.Entities
 {
+  public class InternalSettingsGroup : SettingsGroup { }
+
   public class SettingsGroup
   {
     public string Name { get; set; }
diff --git a/zero.Core/Entities/Spaces/Space.cs b/zero.Core/Entities/Spaces/Space.cs
index d5458a1a..9575311c 100644
--- a/zero.Core/Entities/Spaces/Space.cs
+++ b/zero.Core/Entities/Spaces/Space.cs
@@ -2,7 +2,7 @@
 
 namespace zero.Core.Entities
 {
-  public class Space : ISpace
+  public class Space
   {
     public string Alias { get; set; }
 
@@ -22,26 +22,4 @@ namespace zero.Core.Entities
 
     public bool LineBelow { get; set; }
   }
-
-  public interface ISpace
-  {
-    string Alias { get; set; }
-
-    string EditorAlias { get; set; }
-
-    string ComponentPath { get; set; }
-
-    string Description { get; set; }
-
-    string Icon { get; set; }
-
-    bool LineBelow { get; set; }
-
-    string Name { get; set; }
-
-    Type Type { get; set; }
-
-    SpaceView View { get; set; }
-
-  }
 }
\ No newline at end of file
diff --git a/zero.Core/Entities/Spaces/SpaceContent.cs b/zero.Core/Entities/Spaces/SpaceContent.cs
index 65b3098e..9fbbcbbd 100644
--- a/zero.Core/Entities/Spaces/SpaceContent.cs
+++ b/zero.Core/Entities/Spaces/SpaceContent.cs
@@ -2,27 +2,16 @@
 
 namespace zero.Core.Entities
 {
-  /// <summary>
-  /// A list item can consist of unlimited properties and be rendered as you wish
-  /// The backoffice rendering is done by an IRenderer
-  /// </summary>
-  public class SpaceContent : ZeroEntity, ISpaceContent
-  {
-    /// <inheritdoc />
-    public string SpaceAlias { get; set; }
-  }
-
-
   /// <summary>
   /// A list item can consist of unlimited properties and be rendered as you wish
   /// The backoffice rendering is done by an IRenderer
   /// </summary>
   [Collection("SpaceContents")]
-  public interface ISpaceContent : IZeroEntity, IZeroDbConventions
+  public class SpaceContent : ZeroEntity
   {
     /// <summary>
     /// Associated space
     /// </summary>
-    string SpaceAlias { get; set; }
+    public string SpaceAlias { get; set; }
   }
 }
\ No newline at end of file
diff --git a/zero.Core/Entities/Spaces/SpaceView.cs b/zero.Core/Entities/Spaces/SpaceView.cs
index a0f031a4..acbaf821 100644
--- a/zero.Core/Entities/Spaces/SpaceView.cs
+++ b/zero.Core/Entities/Spaces/SpaceView.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace zero.Core.Entities
+namespace zero.Core.Entities
 {
   public enum SpaceView
   {
diff --git a/zero.Core/Entities/Translation.cs b/zero.Core/Entities/Translation.cs
index cd5221d4..67293624 100644
--- a/zero.Core/Entities/Translation.cs
+++ b/zero.Core/Entities/Translation.cs
@@ -1,17 +1,16 @@
-using zero.Core.Attributes;
-
-namespace zero.Core.Entities
+namespace zero.Core.Entities
 {
-  public class Translation : ZeroEntity, ITranslation
+  public class Translation : ZeroEntity
   {
-    /// <inheritdoc />
-    public string LanguageId { get; set; }
-
-    /// <inheritdoc />
+    /// <summary>
+    /// Value of the translation
+    /// </summary>
     public string Value { get; set; }
 
-    /// <inheritdoc />
-    public TranslationDisplay Display { get; set; } 
+    /// <summary>
+    /// Display + input type
+    /// </summary>
+    public TranslationDisplay Display { get; set; }
   }
 
 
@@ -20,19 +19,4 @@ namespace zero.Core.Entities
     Text = 0,
     HTML = 1
   }
-
-
-  [Collection("Translations")]
-  public interface ITranslation : IZeroEntity, ILanguageAwareEntity, IZeroDbConventions
-  {
-    /// <summary>
-    /// Value of the translation
-    /// </summary>
-    string Value { get; set; }
-
-    /// <summary>
-    /// Display + input type
-    /// </summary>
-    TranslationDisplay Display { get; set; }
-  }
 }
\ No newline at end of file
diff --git a/zero.Core/Entities/User/BackofficeUser.cs b/zero.Core/Entities/User/BackofficeUser.cs
index 6ebc0ccb..72aaa1af 100644
--- a/zero.Core/Entities/User/BackofficeUser.cs
+++ b/zero.Core/Entities/User/BackofficeUser.cs
@@ -1,101 +1,28 @@
-using System;
-using System.Collections.Generic;
-using zero.Core.Attributes;
-using zero.Core.Identity;
+using zero.Core.Attributes;
 
 namespace zero.Core.Entities
 {
-  public class BackofficeUser : ZeroEntity, IBackofficeUser
-  {
-    /// <inheritdoc />
-    public string Username { get; set; }
-
-    /// <inheritdoc />
-    public string AppId { get; set; }
-
-    /// <inheritdoc />
-    public string CurrentAppId { get; set; }
-
-    /// <inheritdoc/>
-    public bool IsSuper { get; set; }
-
-    /// <inheritdoc/>
-    public string Email { get; set; }
-
-    /// <inheritdoc/>
-    public bool IsEmailConfirmed { get; set; }
-
-    /// <inheritdoc/>
-    public string PasswordHash { get; set; }
-
-    /// <inheritdoc/>
-    public string SecurityStamp { get; set; }
-
-    /// <inheritdoc/>
-    public string AvatarId { get; set; }
-
-    /// <inheritdoc/>
-    public string LanguageId { get; set; }
-
-
-
-    /// <inheritdoc/>
-    public List<string> RoleIds { get; set; } = new List<string>();
-
-    /// <inheritdoc/>
-    public List<IUserClaim> Claims { get; set; } = new List<IUserClaim>();
-
-
-
-    /// <inheritdoc/>
-    public int AccessFailedCount { get; set; }
-
-    /// <inheritdoc/>
-    public bool LockoutEnabled { get; set; }
-
-    /// <inheritdoc/>
-    public DateTimeOffset? LockoutEnd { get; set; }
-
-
-
-    ///// <inheritdoc/>
-    //public bool TwoFactorEnabled { get; set; }
-
-    ///// <inheritdoc/>
-    //public string TwoFactorAuthenticatorKey { get; set; }
-
-    ///// <inheritdoc/>
-    //public List<string> TwoFactorRecoveryCodes { get; set; } = new List<string>();
-  }
-
-
   [Collection("Users")]
-  public interface IBackofficeUser : IZeroEntity, IZeroDbConventions, IIdentityUserWithRoles
+  public class BackofficeUser : ZeroIdentityUser
   {
     /// <summary>
     /// Application the user registered in
     /// </summary>
-    string AppId { get; set; }
+    public string AppId { get; set; }
 
     /// <summary>
     /// Currently selected app id for the backoffice
     /// </summary>
-    string CurrentAppId { get; set; }
+    public string CurrentAppId { get; set; }
 
     /// <summary>
-    /// sudo.
-    /// The user who created the instance.
+    /// Super user
     /// </summary>
-    bool IsSuper { get; set; }
+    public bool IsSuper { get; set; }
 
     /// <summary>
     /// Avatar image
     /// </summary>
-    string AvatarId { get; set; }
-
-    /// <summary>
-    /// Backoffice display language
-    /// </summary>
-    string LanguageId { get; set; }
+    public string AvatarId { get; set; }
   }
 }
diff --git a/zero.Core/Entities/User/BackofficeUserRole.cs b/zero.Core/Entities/User/BackofficeUserRole.cs
index 9e81965f..55324988 100644
--- a/zero.Core/Entities/User/BackofficeUserRole.cs
+++ b/zero.Core/Entities/User/BackofficeUserRole.cs
@@ -1,33 +1,18 @@
-using System.Collections.Generic;
-using zero.Core.Attributes;
-using zero.Core.Identity;
+using zero.Core.Attributes;
 
 namespace zero.Core.Entities
 {
-  public class BackofficeUserRole : ZeroEntity, IBackofficeUserRole, IZeroDbConventions
-  {
-    /// <inheritdoc/>
-    public string Description { get; set; }
-
-    /// <inheritdoc/>
-    public string Icon { get; set; }
-
-    /// <inheritdoc/>
-    public List<IUserClaim> Claims { get; set; } = new List<IUserClaim>();
-  }
-
-
   [Collection("Roles")]
-  public interface IBackofficeUserRole : IZeroEntity, IZeroDbConventions, IIdentityUserRole
+  public class BackofficeUserRole : ZeroIdentityRole
   {
     /// <summary>
     /// Additional description
     /// </summary>
-    string Description { get; set; }
+    public string Description { get; set; }
 
     /// <summary>
     /// Displayed icon alongside name
     /// </summary>
-    string Icon { get; set; }
+    public string Icon { get; set; }
   }
 }
\ No newline at end of file
diff --git a/zero.Core/Entities/User/UserClaim.cs b/zero.Core/Entities/User/UserClaim.cs
index 5d2aa929..8056f238 100644
--- a/zero.Core/Entities/User/UserClaim.cs
+++ b/zero.Core/Entities/User/UserClaim.cs
@@ -4,15 +4,21 @@ using System.Security.Claims;
 
 namespace zero.Core.Entities
 {
-  public class UserClaim : IUserClaim
+  public class UserClaim
   {
-    /// <inheritdoc/>
+    /// <summary>
+    /// Gets or sets the claim type for this claim
+    /// </summary>
     public string Type { get; set; }
 
-    /// <inheritdoc/>
+    /// <summary>
+    /// Gets or sets the claim value for this claim
+    /// </summary>
     public string Value { get; set; }
 
-    /// <inheritdoc/>
+    /// <summary>
+    /// Convert to a claim
+    /// </summary>
     public Claim ToClaim() => new Claim(Type, Value);
 
     public UserClaim() { }
@@ -38,34 +44,14 @@ namespace zero.Core.Entities
 
 
 
-  public interface IUserClaim
+  public class UserClaimComparer : IEqualityComparer<UserClaim>
   {
-    /// <summary>
-    /// Gets or sets the claim type for this claim
-    /// </summary>
-    string Type { get; set; }
-
-    /// <summary>
-    /// Gets or sets the claim value for this claim
-    /// </summary>
-    string Value { get; set; }
-
-    /// <summary>
-    /// Convert to a claim
-    /// </summary>
-    /// <returns></returns>
-    Claim ToClaim();
-  }
-
-
-  public class UserClaimComparer : IEqualityComparer<IUserClaim>
-  {
-    public bool Equals(IUserClaim x, IUserClaim y)
+    public bool Equals(UserClaim x, UserClaim y)
     {
       return (x == null && y == null) || (x.Type.Equals(y.Type, StringComparison.InvariantCultureIgnoreCase) && x.Value.Equals(y.Value, StringComparison.InvariantCultureIgnoreCase));
     }
 
-    public int GetHashCode(IUserClaim obj)
+    public int GetHashCode(UserClaim obj)
     {
       return (obj.Type + obj.Value).GetHashCode();
     }
diff --git a/zero.Core/Entities/User/ZeroIdentityRole.cs b/zero.Core/Entities/User/ZeroIdentityRole.cs
new file mode 100644
index 00000000..0ce8b0e8
--- /dev/null
+++ b/zero.Core/Entities/User/ZeroIdentityRole.cs
@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+
+namespace zero.Core.Entities
+{
+  public abstract class ZeroIdentityRole : ZeroEntity
+  {
+    /// <summary>
+    /// The role's claims, for use in claims-based authentication.
+    /// </summary>
+    public List<UserClaim> Claims { get; set; } = new();
+  }
+}
diff --git a/zero.Core/Identity/IIdentityUser.cs b/zero.Core/Entities/User/ZeroIdentityUser.cs
similarity index 62%
rename from zero.Core/Identity/IIdentityUser.cs
rename to zero.Core/Entities/User/ZeroIdentityUser.cs
index b45c9ee0..7141c6dd 100644
--- a/zero.Core/Identity/IIdentityUser.cs
+++ b/zero.Core/Entities/User/ZeroIdentityUser.cs
@@ -1,82 +1,77 @@
 using System;
 using System.Collections.Generic;
-using zero.Core.Entities;
 
-namespace zero.Core.Identity
+namespace zero.Core.Entities
 {
-  public interface IIdentityUserWithRoles : IIdentityUser
-  {
-    /// <summary>
-    /// The roles (aliases) of the user
-    /// </summary>
-    List<string> RoleIds { get; set; }
-  }
-
-
-  public interface IIdentityUser : IZeroEntity
+  public abstract class ZeroIdentityUser : ZeroEntity
   {
     /// <summary>
     /// Optional username (can also be used as login when configured)
     /// </summary>
-    string Username { get; set; }
+    public string Username { get; set; }
 
     /// <summary>
     /// E-Mail address which is also used as the username
     /// </summary>
-    string Email { get; set; }
+    public string Email { get; set; }
 
     /// <summary>
     /// Whether the email address has been confirmed
     /// </summary>
-    bool IsEmailConfirmed { get; set; }
+    public bool IsEmailConfirmed { get; set; }
 
     /// <summary>
     /// The password hash
     /// </summary>
-    string PasswordHash { get; set; }
+    public string PasswordHash { get; set; }
 
     /// <summary>
     /// The security stamp
     /// </summary>
-    string SecurityStamp { get; set; }
+    public string SecurityStamp { get; set; }
 
     /// <summary>
     /// The user's claims, for use in claims-based authentication.
     /// </summary>
-    List<IUserClaim> Claims { get; set; }
+    public List<UserClaim> Claims { get; set; } = new();
+
+    /// <summary>
+    /// The roles (aliases) of the user
+    /// </summary>
+    public List<string> RoleIds { get; set; } = new();
 
 
 
     /// <summary>
     /// Number of times sign in failed.
     /// </summary>
-    int AccessFailedCount { get; set; }
+    public int AccessFailedCount { get; set; }
 
     /// <summary>
     /// Whether the user is locked out.
     /// </summary>
-    bool LockoutEnabled { get; set; }
+    public bool LockoutEnabled { get; set; }
 
     /// <summary>
     /// When the user lock out is over.
     /// </summary>
-    DateTimeOffset? LockoutEnd { get; set; }
+    public DateTimeOffset? LockoutEnd { get; set; }
 
 
 
     ///// <summary>
     ///// Whether 2-factor authentication is enabled or not
     ///// </summary>
-    //bool TwoFactorEnabled { get; set; }
+    //public bool TwoFactorEnabled { get; set; }
 
     ///// <summary>
     ///// The two-factor authenticator key
     ///// </summary>
-    //string TwoFactorAuthenticatorKey { get; set; }
+    //public string TwoFactorAuthenticatorKey { get; set; }
 
     ///// <summary>
     ///// The list of two factor authentication recovery codes
     ///// </summary>
-    //List<string> TwoFactorRecoveryCodes { get; set; }
+    //public List<string> TwoFactorRecoveryCodes { get; set; }
   }
 }
diff --git a/zero.Core/Entities/ZeroEntity.cs b/zero.Core/Entities/ZeroEntity.cs
index e57d69c9..d0132e12 100644
--- a/zero.Core/Entities/ZeroEntity.cs
+++ b/zero.Core/Entities/ZeroEntity.cs
@@ -5,81 +5,37 @@ using System.Diagnostics;
 namespace zero.Core.Entities
 {
   [DebuggerDisplay("Id = {Id,nq}, Name = {Name}, Alias = {Alias}")]
-  public abstract class ZeroEntity : IZeroEntity
-  {
-    /// <inheritdoc/>
-    public string Id { get; set; }
-
-    /// <inheritdoc/>
-    public string Name { get; set; }
-
-    /// <inheritdoc/>
-    public string Alias { get; set; }
-
-    /// <inheritdoc/>
-    public string Key { get; set; }
-
-    /// <inheritdoc/>
-    public uint Sort { get; set; }
-
-    /// <inheritdoc/>
-    public bool IsActive { get; set; }
-
-    /// <inheritdoc/>
-    public string Hash { get; set; }
-
-    /// <inheritdoc/>
-    public string LastModifiedById { get; set; }
-
-    /// <inheritdoc/>
-    public DateTimeOffset LastModifiedDate { get; set; }
-
-    /// <inheritdoc/>
-    public string CreatedById { get; set; }
-
-    /// <inheritdoc/>
-    public DateTimeOffset CreatedDate { get; set; }
-
-    /// <inheritdoc/>
-    public BlueprintConfiguration Blueprint { get; set; }
-
-    /// <inheritdoc/>
-    [JsonIgnore]
-    public string Url { get; set; }
-  }
-
-
-  public interface IZeroEntity : IZeroIdEntity
+  public abstract class ZeroEntity : ZeroIdEntity, IZeroDbConventions
   {
     /// <summary>
     /// Full name of the entity
     /// </summary>
-    string Name { get; set; }
+    public string Name { get; set; }
 
     /// <summary>
     /// Unique alias which can be used in the frontend and URLs
     /// </summary>
-    string Alias { get; set; }
+    public string Alias { get; set; }
 
     /// <summary>
     /// A key which can be used to query this entity in code
     /// </summary>
-    string Key { get; set; }
+    public string Key { get; set; }
 
     /// <summary>
     /// Sort order
     /// </summary>
-    uint Sort { get; set; }
+    public uint Sort { get; set; }
 
     /// <summary>
     /// Whether the entity is visible in the frontend
     /// </summary>
-    bool IsActive { get; set; }
+    public bool IsActive { get; set; }
 
     /// <summary>
     /// Unique hash for this entity (primarily used for routing)
     /// </summary>
-    string Hash { get; set; }
+    public string Hash { get; set; }
 
     /// <summary>
     /// Backoffice user who last modified this content
@@ -89,23 +45,27 @@ namespace zero.Core.Entities
     /// <summary>
     /// Date of last modification
     /// </summary>
-    DateTimeOffset LastModifiedDate { get; set; }
+    public DateTimeOffset LastModifiedDate { get; set; }
 
     /// <summary>
     /// Backoffice user who created this content
     /// </summary>
-    [Overwrite]
     public string CreatedById { get; set; }
 
     /// <summary>
     /// Date of creation
     /// </summary>
-    DateTimeOffset CreatedDate { get; set; }
+    public DateTimeOffset CreatedDate { get; set; }
 
     /// <summary>
     /// Configuration of the base entity (which this one inherits from)
     /// </summary>
-    BlueprintConfiguration Blueprint { get; set; }
+    public BlueprintConfiguration Blueprint { get; set; }
+
+    /// <summary>
+    /// Language of the entity
+    /// </summary>
+    public string LanguageId { get; set; }
 
     /// <summary>
     /// [Warning] This field is always empty when bound to the database.
@@ -114,4 +74,13 @@ namespace zero.Core.Entities
     [JsonIgnore]
     public string Url { get; set; }
   }
+
+
+  public abstract class ZeroIdEntity
+  {
+    /// <summary>
+    /// Id of the entity
+    /// </summary>
+    public string Id { get; set; }
+  }
 }
diff --git a/zero.Core/Entities/ZeroReference.cs b/zero.Core/Entities/ZeroReference.cs
index 6fda4079..c60b3837 100644
--- a/zero.Core/Entities/ZeroReference.cs
+++ b/zero.Core/Entities/ZeroReference.cs
@@ -6,18 +6,18 @@ namespace zero.Core.Entities
   {
     public ZeroReference() { }
 
-    public ZeroReference(IZeroEntity entity)
+    public ZeroReference(ZeroEntity entity)
     {
       Id = entity.Id;
       Name = entity.Name;
     }
 
-    public static ZeroReference From(IZeroEntity entity)
+    public static ZeroReference From(ZeroEntity entity)
     {
       return entity == null ? null : new ZeroReference(entity);
     }
 
-    public static ZeroReference From<T>(T entity, Func<T, string> transform) where T : IZeroEntity
+    public static ZeroReference From<T>(T entity, Func<T, string> transform) where T : ZeroEntity
     {
       return entity == null ? null : new ZeroReference()
       {
diff --git a/zero.Core/Extensions/BackofficeUserExtensions.cs b/zero.Core/Extensions/BackofficeUserExtensions.cs
index 620e16fa..ce3c4b34 100644
--- a/zero.Core/Extensions/BackofficeUserExtensions.cs
+++ b/zero.Core/Extensions/BackofficeUserExtensions.cs
@@ -7,7 +7,7 @@ namespace zero.Core.Extensions
 {
   public static class BackofficeUserExtensions
   {
-    public static string[] GetAllowedAppIds(this IBackofficeUser user)
+    public static string[] GetAllowedAppIds(this BackofficeUser user)
     {
       if (user == null)
       {
diff --git a/zero.Core/Extensions/EnumerableExtensions.cs b/zero.Core/Extensions/EnumerableExtensions.cs
index 3d6ba7c9..4cd26aee 100644
--- a/zero.Core/Extensions/EnumerableExtensions.cs
+++ b/zero.Core/Extensions/EnumerableExtensions.cs
@@ -10,7 +10,7 @@ namespace zero.Core.Extensions
     /// <summary>
     /// 
     /// </summary>
-    public static ListResult<T> ToQueriedList<T>(this IEnumerable<T> items, ListQuery<T> query) where T : IZeroEntity
+    public static ListResult<T> ToQueriedList<T>(this IEnumerable<T> items, ListQuery<T> query) where T : ZeroEntity
     {
       //queryable = queryable.Statistics(out QueryStatistics stats);
 
diff --git a/zero.Core/Extensions/RavenQueryableExtensions.cs b/zero.Core/Extensions/RavenQueryableExtensions.cs
index 9cce05a6..375d1059 100644
--- a/zero.Core/Extensions/RavenQueryableExtensions.cs
+++ b/zero.Core/Extensions/RavenQueryableExtensions.cs
@@ -1,11 +1,9 @@
 using Raven.Client.Documents;
 using Raven.Client.Documents.Linq;
 using Raven.Client.Documents.Session;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using zero.Core.Api;
 using zero.Core.Entities;
 
 namespace zero.Core.Extensions
@@ -13,7 +11,7 @@ namespace zero.Core.Extensions
   public static class RavenQueryableExtensions
   {
     // TODO we need to simplify these extensions methods.
-    // ToQueriedListAsyncX is used in MediaCollection for the Media_ByParent index, which produces MediaListItem (which is no IZeroEntity)
+    // ToQueriedListAsyncX is used in MediaCollection for the Media_ByParent index, which produces MediaListItem (which is no ZeroEntity)
     /// <summary>
     /// 
     /// </summary>
@@ -61,7 +59,7 @@ namespace zero.Core.Extensions
     /// <summary>
     /// 
     /// </summary>
-    public static async Task<ListResult<T>> ToQueriedListAsync<T>(this IRavenQueryable<T> queryable, ListQuery<T> query) where T : IZeroEntity
+    public static async Task<ListResult<T>> ToQueriedListAsync<T>(this IRavenQueryable<T> queryable, ListQuery<T> query) where T : ZeroEntity
     {
       queryable = queryable.Statistics(out QueryStatistics stats);
 
@@ -150,7 +148,7 @@ namespace zero.Core.Extensions
     /// <summary>
     /// 
     /// </summary>
-    public static async Task<ListResult<T>> ToQueriedListAsync<T, TFilter>(this IRavenQueryable<T> queryable, ListQuery<T, TFilter> query) where T : IZeroEntity where TFilter : IListSpecificQuery
+    public static async Task<ListResult<T>> ToQueriedListAsync<T, TFilter>(this IRavenQueryable<T> queryable, ListQuery<T, TFilter> query) where T : ZeroEntity where TFilter : IListSpecificQuery
     {
       queryable = queryable.Statistics(out QueryStatistics stats);
 
diff --git a/zero.Core/Extensions/ValidatorExtensions.cs b/zero.Core/Extensions/ValidatorExtensions.cs
index 82b8f99b..cdaa88c6 100644
--- a/zero.Core/Extensions/ValidatorExtensions.cs
+++ b/zero.Core/Extensions/ValidatorExtensions.cs
@@ -101,14 +101,14 @@ namespace zero.Core.Extensions
     /// <summary>
     /// Check if this value is unique within a collection
     /// </summary>
-    public static IRuleBuilderOptions<T, TProperty> Unique<T, TProperty>(this IRuleBuilder<T, TProperty> ruleBuilder, IBackofficeStore store) where T : IZeroEntity
+    public static IRuleBuilderOptions<T, TProperty> Unique<T, TProperty>(this IRuleBuilder<T, TProperty> ruleBuilder, IBackofficeStore store) where T : ZeroEntity
     {
       return ruleBuilder.MustAsync(async (entity, value, context, cancellation) =>
       {
         using IAsyncDocumentSession session = store.Store.OpenAsyncSession();
 
         bool any = await session.Advanced.AsyncDocumentQuery<T>()
-          .WhereNotEquals(nameof(IZeroIdEntity.Id), entity.Id)
+          .WhereNotEquals(nameof(ZeroIdEntity.Id), entity.Id)
           .WhereEquals(context.Rule.PropertyName.ToPascalCaseId(), value)
           .AnyAsync(cancellation);
 
@@ -120,14 +120,14 @@ namespace zero.Core.Extensions
     /// <summary>
     /// Check if this value is at least set once to the expected value within a collection
     /// </summary>
-    public static IRuleBuilderOptions<T, TProperty> ExpectAnyUnique<T, TProperty>(this IRuleBuilder<T, TProperty> ruleBuilder, IBackofficeStore store, TProperty expectedValue) where T : IZeroEntity
+    public static IRuleBuilderOptions<T, TProperty> ExpectAnyUnique<T, TProperty>(this IRuleBuilder<T, TProperty> ruleBuilder, IBackofficeStore store, TProperty expectedValue) where T : ZeroEntity
     {
       return ruleBuilder.MustAsync(async (entity, value, context, cancellation) =>
       {
         using IAsyncDocumentSession session = store.Store.OpenAsyncSession();
 
         return await session.Advanced.AsyncDocumentQuery<T>()
-          .WhereNotEquals(nameof(IZeroIdEntity.Id), entity.Id)
+          .WhereNotEquals(nameof(ZeroIdEntity.Id), entity.Id)
           .WhereEquals(context.Rule.PropertyName.ToPascalCaseId(), expectedValue)
           .AnyAsync(cancellation);
       }).WithMessage("@errors.forms.not_unique_alone");
@@ -137,7 +137,7 @@ namespace zero.Core.Extensions
     /// <summary>
     /// Check if this reference exists and is an entity which can be referenced (appId = shared for shareable entities or appId = current)
     /// </summary>
-    public static IRuleBuilderOptions<T, string> Exists<T>(this IRuleBuilder<T, string> ruleBuilder, IBackofficeStore store) where T : IZeroEntity
+    public static IRuleBuilderOptions<T, string> Exists<T>(this IRuleBuilder<T, string> ruleBuilder, IBackofficeStore store) where T : ZeroEntity
     {
       return ruleBuilder.Exists<T, T>(store);
     }
@@ -146,7 +146,7 @@ namespace zero.Core.Extensions
     /// <summary>
     /// Check if this reference exists and is an entity which can be referenced (appId = shared for shareable entities or appId = current)
     /// </summary>
-    public static IRuleBuilderOptions<T, string> Exists<T, TReference>(this IRuleBuilder<T, string> ruleBuilder, IBackofficeStore store) where T : IZeroEntity where TReference : IZeroEntity
+    public static IRuleBuilderOptions<T, string> Exists<T, TReference>(this IRuleBuilder<T, string> ruleBuilder, IBackofficeStore store) where T : ZeroEntity where TReference : ZeroEntity
     {
       return ruleBuilder.MustAsync(async (entity, id, context, cancellation) =>
       {
diff --git a/zero.Core/Handlers/IApplicationResolverHandler.cs b/zero.Core/Handlers/IApplicationResolverHandler.cs
index 08e94b39..f7dc1e98 100644
--- a/zero.Core/Handlers/IApplicationResolverHandler.cs
+++ b/zero.Core/Handlers/IApplicationResolverHandler.cs
@@ -10,6 +10,6 @@ namespace zero.Core.Handlers
 {
   public interface IApplicationResolverHandler : IHandler
   {
-    IApplication Resolve(HttpRequest request, IList<IApplication> applications);
+    Application Resolve(HttpRequest request, IList<Application> applications);
   }
 }
diff --git a/zero.Core/Handlers/IModuleTypeHandler.cs b/zero.Core/Handlers/IModuleTypeHandler.cs
index 76759f6d..9c995b46 100644
--- a/zero.Core/Handlers/IModuleTypeHandler.cs
+++ b/zero.Core/Handlers/IModuleTypeHandler.cs
@@ -5,6 +5,6 @@ namespace zero.Core.Handlers
 {
   public interface IModuleTypeHandler : IHandler
   {
-    IEnumerable<ModuleType> GetAllowedModuleTypes(IApplication application, IEnumerable<ModuleType> registeredTypes, IPage page = default, string[] tags = default);
+    IEnumerable<ModuleType> GetAllowedModuleTypes(Application application, IEnumerable<ModuleType> registeredTypes, Page page = default, string[] tags = default);
   }
 }
diff --git a/zero.Core/Handlers/IPageTypeHandler.cs b/zero.Core/Handlers/IPageTypeHandler.cs
index d5819332..5ab1dc90 100644
--- a/zero.Core/Handlers/IPageTypeHandler.cs
+++ b/zero.Core/Handlers/IPageTypeHandler.cs
@@ -7,6 +7,6 @@ namespace zero.Core.Handlers
 {
   public interface IPageTypeHandler : IHandler
   {
-    IEnumerable<PageType> GetAllowedPageTypes(IApplication application, IEnumerable<PageType> registeredTypes, IEnumerable<IPage> parents);
+    IEnumerable<PageType> GetAllowedPageTypes(Application application, IEnumerable<PageType> registeredTypes, IEnumerable<Page> parents);
   }
 }
diff --git a/zero.Core/Identity/IIdentityUserRole.cs b/zero.Core/Identity/IIdentityUserRole.cs
deleted file mode 100644
index 5bdd43cd..00000000
--- a/zero.Core/Identity/IIdentityUserRole.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System.Collections.Generic;
-using zero.Core.Entities;
-
-namespace zero.Core.Identity
-{
-  public interface IIdentityUserRole : IZeroEntity
-  {
-    /// <summary>
-    /// The user's claims, for use in claims-based authentication.
-    /// </summary>
-    List<IUserClaim> Claims { get; set; }
-  }
-}
diff --git a/zero.Core/Identity/RavenRoleStore(TRole).cs b/zero.Core/Identity/RavenRoleStore(TRole).cs
index d50b9d58..c21ffc65 100644
--- a/zero.Core/Identity/RavenRoleStore(TRole).cs
+++ b/zero.Core/Identity/RavenRoleStore(TRole).cs
@@ -15,7 +15,7 @@ using zero.Core.Options;
 namespace zero.Core.Identity
 {
   public class RavenRoleStore<TRole> : IRoleStore<TRole>, IRoleClaimStore<TRole> 
-    where TRole : class, IIdentityUserRole
+    where TRole : ZeroIdentityRole
   {
     protected IZeroStore Store { get; private set; }
 
diff --git a/zero.Core/Identity/RavenScopedStores.cs b/zero.Core/Identity/RavenScopedStores.cs
index 0900e0ae..f43ebffc 100644
--- a/zero.Core/Identity/RavenScopedStores.cs
+++ b/zero.Core/Identity/RavenScopedStores.cs
@@ -1,11 +1,12 @@
 using Microsoft.AspNetCore.Identity;
 using zero.Core.Database;
+using zero.Core.Entities;
 using zero.Core.Options;
 
 namespace zero.Core.Identity
 {
   public class RavenCoreRoleStore<TRole> : RavenRoleStore<TRole> 
-    where TRole : class, IIdentityUserRole
+    where TRole : ZeroIdentityRole
   {
     public RavenCoreRoleStore(IZeroStore store, IZeroOptions options, IdentityErrorDescriber describer = null) : base(store, options, describer) { }
 
@@ -16,7 +17,7 @@ namespace zero.Core.Identity
 
 
   public class RavenCoreUserStore<TUser> : RavenUserStore<TUser>
-    where TUser : class, IIdentityUser
+    where TUser : ZeroIdentityUser
   {
     public RavenCoreUserStore(IZeroStore store, IZeroOptions options) : base(store, options) { }
 
@@ -27,8 +28,8 @@ namespace zero.Core.Identity
 
 
   public class RavenCoreUserStore<TUser, TRole> : RavenUserStore<TUser, TRole>
-    where TUser : class, IIdentityUserWithRoles
-    where TRole : class, IIdentityUserRole
+    where TUser : ZeroIdentityUser
+    where TRole : ZeroIdentityRole
   {
     public RavenCoreUserStore(IZeroStore store, IZeroOptions options) : base(store, options) { }
 
diff --git a/zero.Core/Identity/RavenUserStore(TUser).cs b/zero.Core/Identity/RavenUserStore(TUser).cs
index e0b73b7b..e247ea2b 100644
--- a/zero.Core/Identity/RavenUserStore(TUser).cs
+++ b/zero.Core/Identity/RavenUserStore(TUser).cs
@@ -23,7 +23,7 @@ namespace zero.Core.Identity
     IUserClaimStore<TUser>,
     IUserSecurityStampStore<TUser>,
     IProtectedUserStore<TUser>
-    where TUser : class, IIdentityUser
+    where TUser : ZeroIdentityUser
   {
     protected IZeroStore Store { get; private set; }
 
diff --git a/zero.Core/Identity/RavenUserStore(TUser,TRole).cs b/zero.Core/Identity/RavenUserStore(TUser,TRole).cs
index bfd038f9..1f376103 100644
--- a/zero.Core/Identity/RavenUserStore(TUser,TRole).cs
+++ b/zero.Core/Identity/RavenUserStore(TUser,TRole).cs
@@ -8,6 +8,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using zero.Core.Database;
+using zero.Core.Entities;
 using zero.Core.Options;
 
 namespace zero.Core.Identity
@@ -17,8 +18,8 @@ namespace zero.Core.Identity
 
   public partial class RavenUserStore<TUser, TRole> : RavenUserStore<TUser>,
     IUserRoleStore<TUser>
-    where TUser : class, IIdentityUserWithRoles
-    where TRole : class, IIdentityUserRole
+    where TUser : ZeroIdentityUser
+    where TRole : ZeroIdentityRole
   {
     public RavenUserStore(IZeroStore store, IZeroOptions options) : base(store, options) { }
 
diff --git a/zero.Core/Identity/ZeroIdentityExtensions.cs b/zero.Core/Identity/ZeroIdentityExtensions.cs
index b00611a0..de143aa5 100644
--- a/zero.Core/Identity/ZeroIdentityExtensions.cs
+++ b/zero.Core/Identity/ZeroIdentityExtensions.cs
@@ -2,6 +2,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using System;
+using zero.Core.Entities;
 using zero.Core.Security;
 
 namespace zero.Core.Identity
@@ -9,8 +10,8 @@ namespace zero.Core.Identity
   public static class ZeroIdentityExtensions
   {
     public static IdentityBuilder AddZeroIdentity<TUser, TRole>(this IServiceCollection services) 
-      where TUser : class, IIdentityUserWithRoles, IIdentityUser
-      where TRole : class, IIdentityUserRole
+      where TUser : ZeroIdentityUser
+      where TRole : ZeroIdentityRole
     {
       services.AddZeroIdentityCore<TUser>();
 
@@ -31,7 +32,7 @@ namespace zero.Core.Identity
 
 
     public static IdentityBuilder AddZeroIdentity<TUser>(this IServiceCollection services)
-      where TUser : class, IIdentityUser
+      where TUser : ZeroIdentityUser
     {
       services.AddZeroIdentityCore<TUser>();
 
@@ -47,7 +48,7 @@ namespace zero.Core.Identity
 
 
     static IServiceCollection AddZeroIdentityCore<TUser>(this IServiceCollection services)
-      where TUser : class, IIdentityUser
+      where TUser : ZeroIdentityUser
     {
       services.AddHttpContextAccessor();
       services.AddOptions();
@@ -85,7 +86,7 @@ namespace zero.Core.Identity
 
       services.Configure<SecurityStampValidatorOptions>(opts =>
       {
-        opts.ValidationInterval = TimeSpan.FromMinutes(30);
+        opts.ValidationInterval = TimeSpan.FromMinutes(90);
       });
 
       return services;
diff --git a/zero.Core/Integrations/Integration.cs b/zero.Core/Integrations/Integration.cs
index a683b73b..df9b7e23 100644
--- a/zero.Core/Integrations/Integration.cs
+++ b/zero.Core/Integrations/Integration.cs
@@ -4,18 +4,14 @@ using zero.Core.Entities;
 
 namespace zero.Core.Integrations
 {
-  /// <inheritdoc />
-  public class Integration : ZeroEntity, IIntegration
-  {
-    /// <inheritdoc />
-    public string TypeAlias { get; set; }
-  }
-
-
   /// <summary>
   /// An integration is an application part which has a public configuration per app.
   /// It's up to the user to provide functionality.
   /// </summary>
   [Collection("Integrations")]
-  public interface IIntegration : IZeroConfigEntity, IZeroDbConventions { }
+  public class Integration : ZeroEntity
+  {
+    /// <inheritdoc />
+    public string TypeAlias { get; set; }
+  }
 }
\ No newline at end of file
diff --git a/zero.Core/Mails/Mail.cs b/zero.Core/Mails/Mail.cs
index 619a14bb..1745f53b 100644
--- a/zero.Core/Mails/Mail.cs
+++ b/zero.Core/Mails/Mail.cs
@@ -19,7 +19,7 @@ namespace zero.Core.Mails
 
     public string Preheader { get; set; }
 
-    public IMailTemplate Template { get; set; }
+    public MailTemplate Template { get; set; }
 
     public MailPlaceholders Placeholders { get; set; } = new();
 
diff --git a/zero.Core/Mails/MailProvider.cs b/zero.Core/Mails/MailProvider.cs
index 1864c784..5ad16872 100644
--- a/zero.Core/Mails/MailProvider.cs
+++ b/zero.Core/Mails/MailProvider.cs
@@ -43,7 +43,7 @@ namespace zero.Core.Mails
     /// <inheritdoc />
     public virtual async Task<T> Create<T>(string mailTemplateKey, CancellationToken token = default) where T : Mail, new()
     {
-      IMailTemplate template = await GetMailTemplate(mailTemplateKey);
+      MailTemplate template = await GetMailTemplate(mailTemplateKey);
 
       if (template == null)
       {
@@ -58,7 +58,7 @@ namespace zero.Core.Mails
     /// <inheritdoc />
     public virtual async Task<Mail> Create(string mailTemplateKey, CancellationToken token = default)
     {
-      IMailTemplate template = await GetMailTemplate(mailTemplateKey);
+      MailTemplate template = await GetMailTemplate(mailTemplateKey);
 
       if (template == null)
       {
@@ -95,7 +95,7 @@ namespace zero.Core.Mails
 
 
     
-    protected virtual async Task<IMailTemplate> GetMailTemplate(string key)
+    protected virtual async Task<MailTemplate> GetMailTemplate(string key)
     {
       return await Collection.GetByKey(key);
     }
@@ -128,7 +128,7 @@ namespace zero.Core.Mails
     }
 
 
-    protected virtual T Merge<T>(T mail, IMailTemplate template) where T : Mail
+    protected virtual T Merge<T>(T mail, MailTemplate template) where T : Mail
     {
       mail.Template = template;
 
diff --git a/zero.Core/Options/FeatureOptions.cs b/zero.Core/Options/FeatureOptions.cs
index 4b5bab9b..e901c337 100644
--- a/zero.Core/Options/FeatureOptions.cs
+++ b/zero.Core/Options/FeatureOptions.cs
@@ -2,9 +2,9 @@
 
 namespace zero.Core.Options
 {
-  public class FeatureOptions : ZeroBackofficeCollection<IFeature>, IZeroCollectionOptions
+  public class FeatureOptions : ZeroBackofficeCollection<Feature>, IZeroCollectionOptions
   {
-    public void Add<T>() where T : IFeature, new()
+    public void Add<T>() where T : Feature, new()
     {
       Items.Add(new T());
     }
diff --git a/zero.Core/Options/IconOptions.cs b/zero.Core/Options/IconOptions.cs
index 1d779c00..c0fcb6bb 100644
--- a/zero.Core/Options/IconOptions.cs
+++ b/zero.Core/Options/IconOptions.cs
@@ -2,7 +2,7 @@
 
 namespace zero.Core.Options
 {
-  public class IconOptions : ZeroBackofficeCollection<IIconSet>, IZeroCollectionOptions
+  public class IconOptions : ZeroBackofficeCollection<IconSet>, IZeroCollectionOptions
   {
     /// <summary>
     /// Add a new backoffice icon set
diff --git a/zero.Core/Options/RoutingPageResolverOptions.cs b/zero.Core/Options/RoutingPageResolverOptions.cs
index cc084f6e..11934dda 100644
--- a/zero.Core/Options/RoutingPageResolverOptions.cs
+++ b/zero.Core/Options/RoutingPageResolverOptions.cs
@@ -13,11 +13,11 @@ namespace zero.Core.Options
     class ResolverMap
     {
       public Type Type { get; set; }
-      public Expression<Func<IPage, bool>> Impl { get; set; }
+      public Expression<Func<Page, bool>> Impl { get; set; }
     }
 
 
-    public void Add<T>(Expression<Func<IPage, bool>> resolver)
+    public void Add<T>(Expression<Func<Page, bool>> resolver)
     {
       Resolvers.Add(new()
       {
@@ -26,7 +26,7 @@ namespace zero.Core.Options
       });
     }
 
-    public void Replace<T>(Expression<Func<IPage, bool>> resolver)
+    public void Replace<T>(Expression<Func<Page, bool>> resolver)
     {
       Remove<T>();
       Add<T>(resolver);
@@ -38,17 +38,17 @@ namespace zero.Core.Options
       Resolvers.RemoveWhere(x => x.Type == type);
     }
 
-    public Expression<Func<IPage, bool>> Get<T>() => Get(typeof(T));
+    public Expression<Func<Page, bool>> Get<T>() => Get(typeof(T));
 
-    public IEnumerable<Expression<Func<IPage, bool>>> GetAll<T>() => GetAll(typeof(T));
+    public IEnumerable<Expression<Func<Page, bool>>> GetAll<T>() => GetAll(typeof(T));
 
-    public Expression<Func<IPage, bool>> Get(Type type)
+    public Expression<Func<Page, bool>> Get(Type type)
     {
       ResolverMap map = Resolvers.LastOrDefault(x => x.Type == type);
       return map?.Impl;
     }
 
-    public IEnumerable<Expression<Func<IPage, bool>>> GetAll(Type type)
+    public IEnumerable<Expression<Func<Page, bool>>> GetAll(Type type)
     {
       IEnumerable<ResolverMap> maps = Resolvers.Where(x => x.Type == type);
       return maps.Select(map => map.Impl).Where(x => x != null);
diff --git a/zero.Core/Routing/AbtractRouteProvider.cs b/zero.Core/Routing/AbtractRouteProvider.cs
index b916300a..c4f09587 100644
--- a/zero.Core/Routing/AbtractRouteProvider.cs
+++ b/zero.Core/Routing/AbtractRouteProvider.cs
@@ -54,9 +54,9 @@ namespace zero.Core.Routing
 
 
     /// <inheritdoc />
-    public virtual async Task<Dictionary<T, IRoute>> GetRoutes(IAsyncDocumentSession session, IEnumerable<T> models, object parameters = null)
+    public virtual async Task<Dictionary<T, Route>> GetRoutes(IAsyncDocumentSession session, IEnumerable<T> models, object parameters = null)
     {
-      Dictionary<T, IRoute> result = new();
+      Dictionary<T, Route> result = new();
       Dictionary<string, T> routeMap = new();
       HashSet<string> routeIds = new();
 
@@ -67,9 +67,9 @@ namespace zero.Core.Routing
         routeMap.TryAdd(routeId, model);
       }
 
-      Dictionary<string, IRoute> routes = await session.LoadAsync<IRoute>(routeIds);
+      Dictionary<string, Route> routes = await session.LoadAsync<Route>(routeIds);
 
-      foreach ((string key, IRoute route) in routes)
+      foreach ((string key, Route route) in routes)
       {
         if (routeMap.TryGetValue(key, out T model))
         {
@@ -82,21 +82,21 @@ namespace zero.Core.Routing
 
 
     /// <inheritdoc />
-    public virtual async Task<Dictionary<object, IRoute>> GetRoutes(IAsyncDocumentSession session, IEnumerable<object> models, object parameters = null)
+    public virtual async Task<Dictionary<object, Route>> GetRoutes(IAsyncDocumentSession session, IEnumerable<object> models, object parameters = null)
     {
       return (await GetRoutes(session, models.Select(x => (T)x).ToArray(), parameters)).ToDictionary(x => (object)x.Key, x => x.Value);
     }
 
 
     /// <inheritdoc />
-    public virtual async Task<IRoute> GetRoute(IAsyncDocumentSession session, T model, object parameters = null)
+    public virtual async Task<Route> GetRoute(IAsyncDocumentSession session, T model, object parameters = null)
     {
-      return await session.LoadAsync<IRoute>(GetRouteId(model, parameters));
+      return await session.LoadAsync<Route>(GetRouteId(model, parameters));
     }
 
 
     /// <inheritdoc />
-    public virtual async Task<IRoute> GetRoute(IAsyncDocumentSession session, object model, object parameters = null)
+    public virtual async Task<Route> GetRoute(IAsyncDocumentSession session, object model, object parameters = null)
     {
       if (!(model is T))
       {
@@ -107,7 +107,7 @@ namespace zero.Core.Routing
 
 
     /// <inheritdoc />
-    public virtual Task<IResolvedRoute> ResolveRoute(IAsyncDocumentSession session, IRoute route)
+    public virtual Task<IResolvedRoute> ResolveRoute(IAsyncDocumentSession session, Route route)
     {
       DefaultResolvedRoute resolved = new DefaultResolvedRoute() { Route = route };
       return Task.FromResult((IResolvedRoute)resolved);
@@ -115,7 +115,7 @@ namespace zero.Core.Routing
 
 
     /// <inheritdoc />
-    public abstract Task<IList<IRoute>> GetAllRoutes(IAsyncDocumentSession session);
+    public abstract Task<IList<Route>> GetAllRoutes(IAsyncDocumentSession session);
 
 
     /// <inheritdoc />
@@ -134,13 +134,13 @@ namespace zero.Core.Routing
     }
 
 
-    protected async Task<IPage> ResolvePage(IAsyncDocumentSession session)
+    protected async Task<Page> ResolvePage(IAsyncDocumentSession session)
     {
-      IEnumerable<Expression<Func<IPage, bool>>> resolvers = Options.Routing.PageResolvers.GetAll(typeof(T));
+      IEnumerable<Expression<Func<Page, bool>>> resolvers = Options.Routing.PageResolvers.GetAll(typeof(T));
 
-      foreach (Expression<Func<IPage, bool>> resolver in resolvers.Reverse())
+      foreach (Expression<Func<Page, bool>> resolver in resolvers.Reverse())
       {
-        IPage page = await session.Query<IPage>().FirstOrDefaultAsync(resolver);
+        Page page = await session.Query<Page>().FirstOrDefaultAsync(resolver);
 
         if (page != null)
         {
@@ -152,38 +152,38 @@ namespace zero.Core.Routing
     }
 
 
-    protected async Task<IEnumerable<IPage>> ResolvePages(IAsyncDocumentSession session)
+    protected async Task<IEnumerable<Page>> ResolvePages(IAsyncDocumentSession session)
     {
-      List<IPage> pages = new();
-      IEnumerable<Expression<Func<IPage, bool>>> resolvers = Options.Routing.PageResolvers.GetAll(typeof(T));
+      List<Page> pages = new();
+      IEnumerable<Expression<Func<Page, bool>>> resolvers = Options.Routing.PageResolvers.GetAll(typeof(T));
 
-      foreach (Expression<Func<IPage, bool>> resolver in resolvers.Reverse())
+      foreach (Expression<Func<Page, bool>> resolver in resolvers.Reverse())
       {
-        pages.AddRange(await session.Query<IPage>().Where(resolver).ToListAsync());
+        pages.AddRange(await session.Query<Page>().Where(resolver).ToListAsync());
       }
 
       return pages;
     }
 
 
-    protected async Task<IRoute> ResolvePageRoute(IAsyncDocumentSession session)
+    protected async Task<Route> ResolvePageRoute(IAsyncDocumentSession session)
     {
-      IPage page = await ResolvePage(session);
+      Page page = await ResolvePage(session);
 
       // WARNING: we are assuming that the route id is built from the page hash but this could be altered with PageRouteProvier.GetRouteId.
       // we cannot use a dependency on this provider here as we are working from the abstract route provider which is the base of the PageRouteProvider itself,
       // and therefore a circular dependency.
-      return page == null ? null : await session.LoadAsync<IRoute>(ID_PREFIX + page.Hash);
+      return page == null ? null : await session.LoadAsync<Route>(ID_PREFIX + page.Hash);
     }
 
 
-    protected async Task<IEnumerable<IRoute>> ResolvePageRoutes(IAsyncDocumentSession session)
+    protected async Task<IEnumerable<Route>> ResolvePageRoutes(IAsyncDocumentSession session)
     {
-      List<IRoute> routes = new();
-      IEnumerable<IPage> pages = await ResolvePages(session);
+      List<Route> routes = new();
+      IEnumerable<Page> pages = await ResolvePages(session);
 
       string[] ids = pages.Select(x => ID_PREFIX + x.Hash).ToArray();
-      return ids.Length < 1 ? routes : (await session.LoadAsync<IRoute>(ids)).Select(x => x.Value);
+      return ids.Length < 1 ? routes : (await session.LoadAsync<Route>(ids)).Select(x => x.Value);
     }
   }
 }
diff --git a/zero.Core/Routing/DefaultResolvedRoute.cs b/zero.Core/Routing/DefaultResolvedRoute.cs
index c459c3af..3824d626 100644
--- a/zero.Core/Routing/DefaultResolvedRoute.cs
+++ b/zero.Core/Routing/DefaultResolvedRoute.cs
@@ -2,6 +2,6 @@
 {
   public class DefaultResolvedRoute : IResolvedRoute
   {
-    public IRoute Route { get; set; }
+    public Route Route { get; set; }
   }
 }
diff --git a/zero.Core/Routing/ILinkProvider.cs b/zero.Core/Routing/ILinkProvider.cs
index a8cfed73..67e38b6f 100644
--- a/zero.Core/Routing/ILinkProvider.cs
+++ b/zero.Core/Routing/ILinkProvider.cs
@@ -9,16 +9,16 @@ namespace zero.Core.Routing
     /// <summary>
     /// 
     /// </summary>
-    bool CanProcess(ILink link);
+    bool CanProcess(Link link);
 
     /// <summary>
     /// 
     /// </summary>
-    Task<string> Resolve(ILink link);
+    Task<string> Resolve(Link link);
 
     /// <summary>
     /// 
     /// </summary>
-    Task<PreviewModel> Preview(IAsyncDocumentSession session, ILink link);
+    Task<PreviewModel> Preview(IAsyncDocumentSession session, Link link);
   }
 }
diff --git a/zero.Core/Routing/IResolvedRoute.cs b/zero.Core/Routing/IResolvedRoute.cs
index 19e4f207..5cc4402d 100644
--- a/zero.Core/Routing/IResolvedRoute.cs
+++ b/zero.Core/Routing/IResolvedRoute.cs
@@ -2,6 +2,6 @@
 {
   public interface IResolvedRoute
   {
-    IRoute Route { get; set; }
+    Route Route { get; set; }
   }
 }
diff --git a/zero.Core/Routing/IRouteProvider.cs b/zero.Core/Routing/IRouteProvider.cs
index 38b746cf..bdf8cf4d 100644
--- a/zero.Core/Routing/IRouteProvider.cs
+++ b/zero.Core/Routing/IRouteProvider.cs
@@ -11,12 +11,12 @@ namespace zero.Core.Routing
     /// <summary>
     /// Find URL for an entity
     /// </summary>
-    Task<IRoute> GetRoute(IAsyncDocumentSession session, T model, object parameters = null);
+    Task<Route> GetRoute(IAsyncDocumentSession session, T model, object parameters = null);
 
     /// <summary>
     /// Find URLs for mulitple entities
     /// </summary>
-    Task<Dictionary<T, IRoute>> GetRoutes(IAsyncDocumentSession session, IEnumerable<T> models, object parameters = null);
+    Task<Dictionary<T, Route>> GetRoutes(IAsyncDocumentSession session, IEnumerable<T> models, object parameters = null);
 
     /// <summary>
     /// Generate unique route ID for a model
@@ -40,22 +40,22 @@ namespace zero.Core.Routing
     /// Resolve a route and load optional dependencies into it.
     /// This is the data which is passed to the specified controller action.
     /// </summary>
-    Task<IResolvedRoute> ResolveRoute(IAsyncDocumentSession session, IRoute route);
+    Task<IResolvedRoute> ResolveRoute(IAsyncDocumentSession session, Route route);
 
     /// <summary>
     /// Find URL for an entity
     /// </summary>
-    Task<IRoute> GetRoute(IAsyncDocumentSession session, object model, object parameters = null);
+    Task<Route> GetRoute(IAsyncDocumentSession session, object model, object parameters = null);
 
     /// <summary>
     /// Find URLs for mulitple entities
     /// </summary>
-    Task<Dictionary<object, IRoute>> GetRoutes(IAsyncDocumentSession session, IEnumerable<object> models, object parameters = null);
+    Task<Dictionary<object, Route>> GetRoutes(IAsyncDocumentSession session, IEnumerable<object> models, object parameters = null);
 
     /// <summary>
     /// Rebuild all routes for this provider so they can be hydrated into the database
     /// </summary>
-    Task<IList<IRoute>> GetAllRoutes(IAsyncDocumentSession session);
+    Task<IList<Route>> GetAllRoutes(IAsyncDocumentSession session);
 
     /// <summary>
     /// Generate unique route ID for a model
diff --git a/zero.Core/Routing/Links.cs b/zero.Core/Routing/Links.cs
index 5132f82b..b0b76bdf 100644
--- a/zero.Core/Routing/Links.cs
+++ b/zero.Core/Routing/Links.cs
@@ -32,7 +32,7 @@ namespace zero.Core.Routing
 
 
     /// <inheritdoc />
-    public async Task<string> GetUrl(ILink link)
+    public async Task<string> GetUrl(Link link)
     {
       ILinkProvider provider = Providers.LastOrDefault(x => x.CanProcess(link));
 
@@ -47,11 +47,11 @@ namespace zero.Core.Routing
 
 
     /// <inheritdoc />
-    public async Task<Dictionary<ILink, string>> GetUrls(params ILink[] links)
+    public async Task<Dictionary<Link, string>> GetUrls(params Link[] links)
     {
-      Dictionary<ILink, string> result = new();
+      Dictionary<Link, string> result = new();
 
-      foreach (ILink link in links)
+      foreach (Link link in links)
       {
         result.Add(link, await GetUrl(link));
       }
@@ -61,7 +61,7 @@ namespace zero.Core.Routing
 
 
     /// <inheritdoc />
-    public ILinkProvider GetProvider(ILink link)
+    public ILinkProvider GetProvider(Link link)
     {
       return Providers.LastOrDefault(x => x.CanProcess(link));
     }
@@ -72,17 +72,17 @@ namespace zero.Core.Routing
     /// <summary>
     /// Get URL from a link object by finding a provider which can resolve the link
     /// </summary>
-    Task<string> GetUrl(ILink link);
+    Task<string> GetUrl(Link link);
 
     /// <summary>
     /// Get URLs from link objects by finding matching providers
     /// </summary>
-    Task<Dictionary<ILink, string>> GetUrls(params ILink[] links);
+    Task<Dictionary<Link, string>> GetUrls(params Link[] links);
 
     /// <summary>
     /// Get the provider for a specific link
     /// </summary>
-    ILinkProvider GetProvider(ILink link);
+    ILinkProvider GetProvider(Link link);
 
     /// <summary>
     /// Find a provider by a specific type
diff --git a/zero.Core/Routing/Page/BasePageRoute.cs b/zero.Core/Routing/Page/BasePageRoute.cs
index fbeb28f7..fc4d28fa 100644
--- a/zero.Core/Routing/Page/BasePageRoute.cs
+++ b/zero.Core/Routing/Page/BasePageRoute.cs
@@ -7,13 +7,13 @@ namespace zero.Core.Routing
   {
     public BasePageRoute() { }
 
-    public BasePageRoute(IRoute route)
+    public BasePageRoute(Route route)
     {
       Route = route;
     }
 
-    public IPage Page { get; set; }
+    public Page Page { get; set; }
 
-    public IRoute Route { get; set; }
+    public Route Route { get; set; }
   }
 }
diff --git a/zero.Core/Routing/Page/IPageUrlBuilder.cs b/zero.Core/Routing/Page/IPageUrlBuilder.cs
index ac6afbee..8c9a573e 100644
--- a/zero.Core/Routing/Page/IPageUrlBuilder.cs
+++ b/zero.Core/Routing/Page/IPageUrlBuilder.cs
@@ -13,11 +13,11 @@ namespace zero.Core.Routing
     /// <summary>
     /// Get URL for a page
     /// </summary>
-    Task<string> GetUrl(IPage page);
+    Task<string> GetUrl(Page page);
 
     /// <summary>
     /// Get URL for a page
     /// </summary>
-    string GetUrl(IPage page, IEnumerable<IPage> parents);
+    string GetUrl(Page page, IEnumerable<Page> parents);
   }
 }
diff --git a/zero.Core/Routing/Page/PageLinkProvider.cs b/zero.Core/Routing/Page/PageLinkProvider.cs
index 4da08739..a74002df 100644
--- a/zero.Core/Routing/Page/PageLinkProvider.cs
+++ b/zero.Core/Routing/Page/PageLinkProvider.cs
@@ -26,7 +26,7 @@ namespace zero.Core.Routing
     /// <summary>
     /// Creates a new link object from a page
     /// </summary>
-    public ILink Create(IPage page, LinkTarget target = LinkTarget.Default, string title = null)
+    public Link Create(Page page, LinkTarget target = LinkTarget.Default, string title = null)
     {
       return new Link()
       {
@@ -42,19 +42,19 @@ namespace zero.Core.Routing
 
 
     /// <inheritdoc />
-    public bool CanProcess(ILink link) => link.Area == AREA;
+    public bool CanProcess(Link link) => link.Area == AREA;
 
 
     /// <inheritdoc />
-    public async Task<string> Resolve(ILink link)
+    public async Task<string> Resolve(Link link)
     {
-      link.Url = await Routes.GetUrl<IPage>(link.Values.GetValueOrDefault<string>("id")) + (link.UrlSuffix ?? string.Empty);
+      link.Url = await Routes.GetUrl<Page>(link.Values.GetValueOrDefault<string>("id")) + (link.UrlSuffix ?? string.Empty);
       return link.Url;
     }
 
 
     /// <inheritdoc />
-    public async Task<PreviewModel> Preview(IAsyncDocumentSession session, ILink link)
+    public async Task<PreviewModel> Preview(IAsyncDocumentSession session, Link link)
     {
       string id = link.Values.GetValueOrDefault<string>("id");
 
@@ -63,7 +63,7 @@ namespace zero.Core.Routing
         return null;
       }
 
-      IPage page = await session.LoadAsync<IPage>(id);
+      Page page = await session.LoadAsync<Page>(id);
 
       if (page == null)
       {
@@ -72,7 +72,7 @@ namespace zero.Core.Routing
 
       PageType pageType = Options.Pages.GetAllItems().FirstOrDefault(x => x.Alias == page.PageTypeAlias);
 
-      string url = await Routes.GetUrl<IPage>(page);
+      string url = await Routes.GetUrl<Page>(page);
 
       return new()
       {
diff --git a/zero.Core/Routing/Page/PageRoute.cs b/zero.Core/Routing/Page/PageRoute.cs
index d6208911..aac3e1e2 100644
--- a/zero.Core/Routing/Page/PageRoute.cs
+++ b/zero.Core/Routing/Page/PageRoute.cs
@@ -6,8 +6,8 @@ namespace zero.Core.Routing
   public class PageRoute : BasePageRoute
   {
     public PageRoute() { }
-    public PageRoute(IRoute route) : base(route) { }
+    public PageRoute(Route route) : base(route) { }
 
-    public IList<IPage> Parents { get; set; }
+    public IList<Page> Parents { get; set; }
   }
 }
diff --git a/zero.Core/Routing/Page/PageRouteProvider.cs b/zero.Core/Routing/Page/PageRouteProvider.cs
index 3f0f6896..93517dab 100644
--- a/zero.Core/Routing/Page/PageRouteProvider.cs
+++ b/zero.Core/Routing/Page/PageRouteProvider.cs
@@ -11,7 +11,7 @@ using zero.Core.Options;
 
 namespace zero.Core.Routing
 {
-  public class PageRouteProvider : AbtractRouteProvider<IPage>
+  public class PageRouteProvider : AbtractRouteProvider<Page>
   {
     protected const string REF_KEY = "page";
     protected const string PAGE_TYPE_KEY = "pageType";
@@ -29,11 +29,11 @@ namespace zero.Core.Routing
 
 
     /// <inheritdoc />
-    public override string GetRouteId(IPage model, object parameters = null) => ID_PREFIX + model.Hash;
+    public override string GetRouteId(Page model, object parameters = null) => ID_PREFIX + model.Hash;
 
 
     /// <inheritdoc />
-    public override async Task<IResolvedRoute> ResolveRoute(IAsyncDocumentSession session, IRoute route)
+    public override async Task<IResolvedRoute> ResolveRoute(IAsyncDocumentSession session, Route route)
     {
       PageRoute resolved = new PageRoute(route);
 
@@ -48,9 +48,9 @@ namespace zero.Core.Routing
       ids.Add(reference.Id);
       ids.AddRange(route.Dependencies);
 
-      Dictionary<string, IPage> pages = await session.LoadAsync<IPage>(ids);
+      Dictionary<string, Page> pages = await session.LoadAsync<Page>(ids);
 
-      if (!pages.TryGetValue(reference.Id, out IPage page))
+      if (!pages.TryGetValue(reference.Id, out Page page))
       {
         return null;
       }
@@ -63,44 +63,44 @@ namespace zero.Core.Routing
 
 
     /// <inheritdoc />
-    public override async Task<IList<IRoute>> GetAllRoutes(IAsyncDocumentSession session)
+    public override async Task<IList<Route>> GetAllRoutes(IAsyncDocumentSession session)
     {
-      IList<IRoute> TraversePageChildren(IPage parent, IEnumerable<IPage> parents, IEnumerable<IPage> allPages)
+      IList<Route> TraversePageChildren(Page parent, IEnumerable<Page> parents, IEnumerable<Page> allPages)
       {
-        List<IRoute> routes = new List<IRoute>();
-        IEnumerable<IPage> currentPages = allPages.Where(x => x.ParentId == parent?.Id);
+        List<Route> routes = new List<Route>();
+        IEnumerable<Page> currentPages = allPages.Where(x => x.ParentId == parent?.Id);
 
-        foreach (IPage page in currentPages)
+        foreach (Page page in currentPages)
         {
-          IRoute route = BuildRoute(page, parents, allPages);
+          Route route = BuildRoute(page, parents, allPages);
 
           if (route != null)
           {
             routes.Add(route);
           }
 
-          routes.AddRange(TraversePageChildren(page, parents.Union(new List<IPage>() { page }), allPages));
+          routes.AddRange(TraversePageChildren(page, parents.Union(new List<Page>() { page }), allPages));
         }
 
         return routes;
       }
 
-      IList<IPage> pages = await session.Query<IPage>().ToListAsync();
-      return TraversePageChildren(null, new List<IPage>() { }, pages);
+      IList<Page> pages = await session.Query<Page>().ToListAsync();
+      return TraversePageChildren(null, new List<Page>() { }, pages);
     }
 
 
     /// <summary>
     /// Build route entity from page
     /// </summary>
-    protected virtual IRoute BuildRoute(IPage page, IEnumerable<IPage> parents, IEnumerable<IPage> allPages)
+    protected virtual Route BuildRoute(Page page, IEnumerable<Page> parents, IEnumerable<Page> allPages)
     {
       if (page is PageFolder)
       {
         return null;
       }
 
-      IRoute route = new Route()
+      Route route = new Route()
       {
         Id = GetRouteId(page),
         Url = UrlBuilder.GetUrl(page, parents),
@@ -112,7 +112,7 @@ namespace zero.Core.Routing
 
       if (parents != null)
       {
-        foreach (IPage parent in parents)
+        foreach (Page parent in parents)
         {
           route.Dependencies.Add(parent.Id);
         }
diff --git a/zero.Core/Routing/Page/PageUrlBuilder.cs b/zero.Core/Routing/Page/PageUrlBuilder.cs
index ff27e7ff..c30f6f01 100644
--- a/zero.Core/Routing/Page/PageUrlBuilder.cs
+++ b/zero.Core/Routing/Page/PageUrlBuilder.cs
@@ -33,22 +33,22 @@ namespace zero.Core.Routing
 
 
     /// <inheritdoc />
-    public async Task<string> GetUrl(IPage page)
+    public async Task<string> GetUrl(Page page)
     {
       using IAsyncDocumentSession session = Store.OpenAsyncSession();
 
       Pages_ByHierarchy.Result result = await session.Query<Pages_ByHierarchy.Result, Pages_ByHierarchy>()
           .ProjectInto<Pages_ByHierarchy.Result>()
-          .Include<Pages_ByHierarchy.Result, IPage>(x => x.Path.Select(p => p.Id))
+          .Include<Pages_ByHierarchy.Result, Page>(x => x.Path.Select(p => p.Id))
           .FirstOrDefaultAsync(x => x.Id == page.Id);
 
-      IList<IPage> parents = (await session.LoadAsync<IPage>(result.Path.Select(x => x.Id))).Select(x => x.Value).ToList();
+      IList<Page> parents = (await session.LoadAsync<Page>(result.Path.Select(x => x.Id))).Select(x => x.Value).ToList();
 
       StringBuilder stringBuilder = new StringBuilder();
 
       if (parents != null)
       {
-        foreach (IPage parent in parents)
+        foreach (Page parent in parents)
         {
           stringBuilder.Append(GetUrlPart(parent));
           stringBuilder.Append(PATH_SEPARATOR);
@@ -68,12 +68,12 @@ namespace zero.Core.Routing
 
 
     /// <inheritdoc />
-    public string GetUrl(IPage page, IEnumerable<IPage> parents)
+    public string GetUrl(Page page, IEnumerable<Page> parents)
     {
       StringBuilder stringBuilder = new StringBuilder();
       stringBuilder.Append(PATH_SEPARATOR);
 
-      void AddPart(IPage page)
+      void AddPart(Page page)
       {
         string part = GetUrlPart(page);
 
@@ -86,7 +86,7 @@ namespace zero.Core.Routing
 
       if (parents != null)
       {
-        foreach (IPage parent in parents)
+        foreach (Page parent in parents)
         {
           AddPart(parent);
         }
@@ -106,7 +106,7 @@ namespace zero.Core.Routing
     /// <summary>
     /// Get the part of the URL (by querying UrlAlias and Alias) for this page
     /// </summary>
-    protected virtual string GetUrlPart(IPage page)
+    protected virtual string GetUrlPart(Page page)
     {
       string alias;
 
diff --git a/zero.Core/Routing/RawLinkProvider.cs b/zero.Core/Routing/RawLinkProvider.cs
index 23285349..cb4f297a 100644
--- a/zero.Core/Routing/RawLinkProvider.cs
+++ b/zero.Core/Routing/RawLinkProvider.cs
@@ -14,7 +14,7 @@ namespace zero.Core.Routing
     /// <summary>
     /// Creates a new link object from an url
     /// </summary>
-    public ILink Create(string url, LinkTarget target = LinkTarget.Default, string title = null)
+    public Link Create(string url, LinkTarget target = LinkTarget.Default, string title = null)
     {
       return new Link()
       {
@@ -30,11 +30,11 @@ namespace zero.Core.Routing
 
 
     /// <inheritdoc />
-    public bool CanProcess(ILink link) => link.Area == AREA;
+    public bool CanProcess(Link link) => link.Area == AREA;
 
 
     /// <inheritdoc />
-    public Task<string> Resolve(ILink link)
+    public Task<string> Resolve(Link link)
     {
       link.Url = link.Values.GetValueOrDefault<string>("url");
       return Task.FromResult(link.Url);
@@ -42,7 +42,7 @@ namespace zero.Core.Routing
 
 
     /// <inheritdoc />
-    public Task<PreviewModel> Preview(IAsyncDocumentSession session, ILink link)
+    public Task<PreviewModel> Preview(IAsyncDocumentSession session, Link link)
     {
       string url = link.Values.GetValueOrDefault<string>("url");
 
diff --git a/zero.Core/Routing/Route.cs b/zero.Core/Routing/Route.cs
index fe61f6ba..6dac8050 100644
--- a/zero.Core/Routing/Route.cs
+++ b/zero.Core/Routing/Route.cs
@@ -5,28 +5,37 @@ using zero.Core.Entities;
 namespace zero.Core.Routing
 {
   [Collection("Routes")]
-  public class Route : IRoute
+  public class Route : ZeroIdEntity
   {
-    /// <inheritdoc />
-    public string Id { get; set; }
-
-    /// <inheritdoc />
+    /// <summary>
+    /// Generated URL based on the URL provider
+    /// </summary>
     public string Url { get; set; }
 
-    /// <inheritdoc />
+    /// <summary>
+    /// Alias of the URL provider which generated this route
+    /// </summary>
     public string ProviderAlias { get; set; }
 
-    /// <inheritdoc />
+    /// <summary>
+    /// Enable this property so all routes are catched which start with this Url
+    /// </summary>
     public bool AllowSuffix { get; set; }
 
-    /// <inheritdoc />
-    public Dictionary<string, object> Params { get; set; } = new Dictionary<string, object>();
+    /// <summary>
+    /// Additional parameters
+    /// </summary>
+    public Dictionary<string, object> Params { get; set; } = new();
 
-    /// <inheritdoc />
-    public IList<RouteReference> References { get; set; } = new List<RouteReference>();
+    /// <summary>
+    /// Contains references to the resolved collection entities
+    /// </summary>
+    public List<RouteReference> References { get; set; } = new();
 
-    /// <inheritdoc />
-    public IList<string> Dependencies { get; set; } = new List<string>();
+    /// <summary>
+    /// Route dependencies can be used for cache busting
+    /// </summary>
+    public List<string> Dependencies { get; set; } = new();
   }
 
 
@@ -44,39 +53,4 @@ namespace zero.Core.Routing
       Collection = collection;
     }
   }
-
-
-  [Collection("Routes")]
-  public interface IRoute : IZeroIdEntity, IZeroDbConventions
-  {
-    /// <summary>
-    /// Generated URL based on the URL provider
-    /// </summary>
-    string Url { get; set; }
-
-    /// <summary>
-    /// Alias of the URL provider which generated this route
-    /// </summary>
-    string ProviderAlias { get; set; }
-
-    /// <summary>
-    /// Enable this property so all routes are catched which start with this Url
-    /// </summary>
-    public bool AllowSuffix { get; set; }
-
-    /// <summary>
-    /// Additional parameters
-    /// </summary>
-    Dictionary<string, object> Params { get; set; }
-
-    /// <summary>
-    /// Contains references to the resolved collection entities
-    /// </summary>
-    IList<RouteReference> References { get; set; }
-
-    /// <summary>
-    /// Route dependencies can be used for cache busting
-    /// </summary>
-    IList<string> Dependencies { get; set; }
-  }
 }
diff --git a/zero.Core/Routing/Routes.cs b/zero.Core/Routing/Routes.cs
index fe4ebc86..65ed7bcf 100644
--- a/zero.Core/Routing/Routes.cs
+++ b/zero.Core/Routing/Routes.cs
@@ -41,7 +41,7 @@ namespace zero.Core.Routing
 
 
     /// <inheritdoc />
-    public async Task<string> GetUrl<T>(string id, object parameters = null) where T : IZeroIdEntity => (await GetRoute<T>(id, parameters))?.Url;
+    public async Task<string> GetUrl<T>(string id, object parameters = null) where T : ZeroIdEntity => (await GetRoute<T>(id, parameters))?.Url;
 
 
     /// <inheritdoc />
@@ -49,7 +49,7 @@ namespace zero.Core.Routing
 
 
     /// <inheritdoc />
-    public async Task<IRoute> GetRoute<T>(string id, object parameters = null) where T : IZeroIdEntity
+    public async Task<Route> GetRoute<T>(string id, object parameters = null) where T : ZeroIdEntity
     {
       if (id.IsNullOrEmpty())
       {
@@ -77,7 +77,7 @@ namespace zero.Core.Routing
 
 
     /// <inheritdoc />
-    public async Task<IRoute> GetRoute<T>(T model, object parameters = null)
+    public async Task<Route> GetRoute<T>(T model, object parameters = null)
     {
       if (model == null)
       {
@@ -98,7 +98,7 @@ namespace zero.Core.Routing
 
 
     /// <inheritdoc />
-    public async Task<Dictionary<T, IRoute>> GetRoutes<T>(IEnumerable<T> models, object parameters = null)
+    public async Task<Dictionary<T, Route>> GetRoutes<T>(IEnumerable<T> models, object parameters = null)
     {
       if (!models.Any())
       {
@@ -119,7 +119,7 @@ namespace zero.Core.Routing
 
 
     /// <inheritdoc />
-    public async Task<IResolvedRoute> ResolveUrl(IApplication application, string path)
+    public async Task<IResolvedRoute> ResolveUrl(Application application, string path)
     {
       path = path.Length > 1 ? path.TrimEnd(PATH_SEPERATOR) : path;
 
@@ -138,13 +138,13 @@ namespace zero.Core.Routing
         min -= 1;
       }
 
-      IList<IRoute> routes = await session.Query<IRoute>()
+      IList<Route> routes = await session.Query<Route>()
         .Where(x => (!x.AllowSuffix && x.Url == path) || (x.AllowSuffix && x.Url.In(parts)))
         .Include("References[].Id")
         .Include("Dependencies")
         .ToListAsync();
 
-      IRoute route = routes.FirstOrDefault();
+      Route route = routes.FirstOrDefault();
 
       // try to get the best matching path when multiple routes are found
       // our assumption is that the best path is those with the longest path parts separated by a slash
@@ -152,7 +152,7 @@ namespace zero.Core.Routing
       if (routes.Count > 1)
       {
         int maxPathParts = routes.Max(x => x.Url.Count(u => u == PATH_SEPERATOR));
-        IEnumerable<IRoute> longestRoutes = routes.Where(x => maxPathParts == x.Url.Count(u => u == PATH_SEPERATOR)).OrderBy(x => x.AllowSuffix);
+        IEnumerable<Route> longestRoutes = routes.Where(x => maxPathParts == x.Url.Count(u => u == PATH_SEPERATOR)).OrderBy(x => x.AllowSuffix);
 
         if (longestRoutes.Count() > 1) 
         {
@@ -179,7 +179,7 @@ namespace zero.Core.Routing
         return null;
       }
 
-      IApplication app = await AppResolver.ResolveFromRequest(context);
+      Application app = await AppResolver.ResolveFromRequest(context);
       string path = context.Request.Path;
 
       if (app == null)
@@ -192,7 +192,7 @@ namespace zero.Core.Routing
 
 
     /// <inheritdoc />
-    public async Task<IResolvedRoute> ResolveRoute(IRoute route)
+    public async Task<IResolvedRoute> ResolveRoute(Route route)
     {
       using IAsyncDocumentSession session = Store.OpenAsyncSession();
       return await ResolveRouteInternal(session, route);
@@ -205,9 +205,9 @@ namespace zero.Core.Routing
       int count = 0;
 
       using IAsyncDocumentSession coreSession = Store.OpenCoreSession();
-      List<IApplication> apps = await coreSession.Query<IApplication>().ToListAsync();
+      List<Application> apps = await coreSession.Query<Application>().ToListAsync();
 
-      foreach (IApplication app in apps)
+      foreach (Application app in apps)
       {
         using IAsyncDocumentSession session = Store.OpenAsyncSession(app.Database);
         session.Advanced.MaxNumberOfRequestsPerSession = 1000;
@@ -215,10 +215,10 @@ namespace zero.Core.Routing
         foreach (IRouteProvider provider in Providers)
         {
           // get all routes for this provider
-          IList<IRoute> routes = await provider.GetAllRoutes(session);
+          IList<Route> routes = await provider.GetAllRoutes(session);
 
           // delete all registered routes in the database for this provider
-          await Store.PurgeAsync<IRoute>(app.Database, $"where {nameof(IRoute.ProviderAlias)} = $alias", new Raven.Client.Parameters()
+          await Store.PurgeAsync<Route>(app.Database, $"where {nameof(Route.ProviderAlias)} = $alias", new Raven.Client.Parameters()
           {
             { "alias", provider.Alias }
           });
@@ -226,7 +226,7 @@ namespace zero.Core.Routing
           // store new routes
           using (BulkInsertOperation bulkInsert = Store.BulkInsert(app.Database))
           {
-            foreach (IRoute route in routes)
+            foreach (Route route in routes)
             {
               await bulkInsert.StoreAsync(route, route.Id);
               count += 1;
@@ -248,7 +248,7 @@ namespace zero.Core.Routing
     /// <summary>
     /// Call the provider which can resolve the route
     /// </summary>
-    async Task<IResolvedRoute> ResolveRouteInternal(IAsyncDocumentSession session, IRoute route)
+    async Task<IResolvedRoute> ResolveRouteInternal(IAsyncDocumentSession session, Route route)
     {
       IRouteProvider routeProvider = FindProvider(route.ProviderAlias);
       return await routeProvider?.ResolveRoute(session, route);
@@ -282,17 +282,17 @@ namespace zero.Core.Routing
     /// <summary>
     /// Get the URL for an entity
     /// </summary>
-    Task<string> GetUrl<T>(string id, object parameters = null) where T : IZeroIdEntity;
+    Task<string> GetUrl<T>(string id, object parameters = null) where T : ZeroIdEntity;
 
     /// <summary> 
     /// Get the route object for an entity
     /// </summary>
-    Task<IRoute> GetRoute<T>(T model, object parameters = null);
+    Task<Route> GetRoute<T>(T model, object parameters = null);
 
     /// <summary> 
     /// Get the route object for an entity
     /// </summary>
-    Task<IRoute> GetRoute<T>(string id, object parameters = null) where T : IZeroIdEntity;
+    Task<Route> GetRoute<T>(string id, object parameters = null) where T : ZeroIdEntity;
 
     /// <summary>
     /// Get URLs for multiple entities
@@ -302,12 +302,12 @@ namespace zero.Core.Routing
     /// <summary>
     /// Get routes for multiple entities
     /// </summary>
-    Task<Dictionary<T, IRoute>> GetRoutes<T>(IEnumerable<T> models, object parameters = null);
+    Task<Dictionary<T, Route>> GetRoutes<T>(IEnumerable<T> models, object parameters = null);
 
     /// <summary>
     /// Resolve an URL from the specified app and the path
     /// </summary>
-    Task<IResolvedRoute> ResolveUrl(IApplication application, string path);
+    Task<IResolvedRoute> ResolveUrl(Application application, string path);
 
     /// <summary>
     /// Resolve an URL from an http context
@@ -317,7 +317,7 @@ namespace zero.Core.Routing
     /// <summary>
     /// Resolve a route object by passing it to the specified provider
     /// </summary>
-    Task<IResolvedRoute> ResolveRoute(IRoute route);
+    Task<IResolvedRoute> ResolveRoute(Route route);
 
     /// <summary>
     /// Purges all routes and rebuilds them by iterating over all registered providers
diff --git a/zero.Core/Security/SchemedSignInManager.cs b/zero.Core/Security/SchemedSignInManager.cs
index 23c58eab..4e1a94fe 100644
--- a/zero.Core/Security/SchemedSignInManager.cs
+++ b/zero.Core/Security/SchemedSignInManager.cs
@@ -17,7 +17,7 @@ namespace zero.Core.Security
   // the authentication breaks when another application signs in a user
   // they share one cookie on both sites/applications, maybe this is an issue
 
-  public class SchemedSignInManager<TUser> : SignInManager<TUser> where TUser : class, IIdentityUser
+  public class SchemedSignInManager<TUser> : SignInManager<TUser> where TUser : ZeroIdentityUser
   {
     protected ZeroAuthOptions<TUser> AuthOptions { get; private set; }
 
diff --git a/zero.Core/Security/ZeroAuthOptions.cs b/zero.Core/Security/ZeroAuthOptions.cs
index 99d41df8..783102ca 100644
--- a/zero.Core/Security/ZeroAuthOptions.cs
+++ b/zero.Core/Security/ZeroAuthOptions.cs
@@ -1,8 +1,8 @@
-using zero.Core.Identity;
+using zero.Core.Entities;
 
 namespace zero.Core.Security
 {
-  public class ZeroAuthOptions<TUser> where TUser : IIdentityUser
+  public class ZeroAuthOptions<TUser> where TUser : ZeroIdentityUser
   {
     public string Scheme { get; set; }
 
diff --git a/zero.Core/Security/ZeroBackofficeClaimsPrincipalFactory.cs b/zero.Core/Security/ZeroBackofficeClaimsPrincipalFactory.cs
index 1c2f19a3..a479b7cb 100644
--- a/zero.Core/Security/ZeroBackofficeClaimsPrincipalFactory.cs
+++ b/zero.Core/Security/ZeroBackofficeClaimsPrincipalFactory.cs
@@ -11,8 +11,8 @@ using zero.Core.Identity;
 namespace zero.Core.Security
 {
   public class ZeroBackofficeClaimsPrincipalFactory<TUser, TRole> : ZeroClaimsPrinicipalFactory<TUser, TRole>
-    where TUser : class, IBackofficeUser
-    where TRole : class, IBackofficeUserRole
+    where TUser : BackofficeUser
+    where TRole : BackofficeUserRole
   {
     public ZeroBackofficeClaimsPrincipalFactory(UserManager<TUser> userManager, RoleManager<TRole> roleManager, IOptions<IdentityOptions> optionsAccessor, IOptions<ZeroAuthOptions<TUser>> authOptions, IZeroContext zero) 
       : base(userManager, roleManager, optionsAccessor, authOptions, zero)
diff --git a/zero.Core/Security/ZeroClaimsPrinicipalFactory.cs b/zero.Core/Security/ZeroClaimsPrinicipalFactory.cs
index 0e99d7c4..cd293cc1 100644
--- a/zero.Core/Security/ZeroClaimsPrinicipalFactory.cs
+++ b/zero.Core/Security/ZeroClaimsPrinicipalFactory.cs
@@ -10,8 +10,8 @@ using zero.Core.Identity;
 namespace zero.Core.Security
 {
   public class ZeroClaimsPrinicipalFactory<TUser, TRole> : ZeroClaimsPrinicipalFactory<TUser>
-    where TUser : class, IIdentityUserWithRoles
-    where TRole : class, IIdentityUserRole
+    where TUser : ZeroIdentityUser
+    where TRole : ZeroIdentityRole
   {
     public RoleManager<TRole> RoleManager { get; private set; }
     
@@ -49,7 +49,7 @@ namespace zero.Core.Security
 
 
   public class ZeroClaimsPrinicipalFactory<TUser> : UserClaimsPrincipalFactory<TUser>, IUserClaimsPrincipalFactory<TUser>
-    where TUser : class, IIdentityUser
+    where TUser : ZeroIdentityUser
   {
     protected ZeroAuthOptions<TUser> AuthOptions { get; private set; }
 
diff --git a/zero.Core/Services/Localizer.cs b/zero.Core/Services/Localizer.cs
index 996b7db9..33cd4263 100644
--- a/zero.Core/Services/Localizer.cs
+++ b/zero.Core/Services/Localizer.cs
@@ -41,7 +41,7 @@ namespace zero.Core.Services
 
       if (!Cache.TryGetValue(key, out string value))
       {
-        ITranslation translation = LoadTranslation(key);
+        Translation translation = LoadTranslation(key);
 
         if (translation == null)
         {
@@ -95,9 +95,9 @@ namespace zero.Core.Services
     /// <summary>
     /// Get translation from database or any other source
     /// </summary>
-    protected virtual ITranslation LoadTranslation(string key)
+    protected virtual Translation LoadTranslation(string key)
     {
-      return Session.Query<ITranslation>().FirstOrDefault(x => x.Key == key);
+      return Session.Query<Translation>().FirstOrDefault(x => x.Key == key);
     }
   }
 
diff --git a/zero.Core/Utils/TableBuilder/TableExport.cs b/zero.Core/Utils/TableBuilder/TableExport.cs
index 8ac7fa3c..d25d9d1d 100644
--- a/zero.Core/Utils/TableBuilder/TableExport.cs
+++ b/zero.Core/Utils/TableBuilder/TableExport.cs
@@ -5,7 +5,7 @@ using zero.Core.Entities;
 
 namespace zero.Core.Utils
 {
-  public abstract class TableExport<TEntity> : ITableExport<TEntity> where TEntity : IZeroEntity
+  public abstract class TableExport<TEntity> : ITableExport<TEntity> where TEntity : ZeroEntity
   {
     public virtual async Task<Stream> Export(TableFormat format = TableFormat.Excel)
     {
@@ -36,7 +36,7 @@ namespace zero.Core.Utils
   }
 
 
-  public interface ITableExport<TEntity> where TEntity : IZeroEntity
+  public interface ITableExport<TEntity> where TEntity : ZeroEntity
   {
     Task<Stream> Export(TableFormat format = TableFormat.Excel);
   }
diff --git a/zero.Core/Utils/ZeroEntityJsonConverter.cs b/zero.Core/Utils/ZeroEntityJsonConverter.cs
index e18578f7..0136c958 100644
--- a/zero.Core/Utils/ZeroEntityJsonConverter.cs
+++ b/zero.Core/Utils/ZeroEntityJsonConverter.cs
@@ -14,7 +14,7 @@
 //    public ZeroEntityJsonConverter()
 //    {
 //      type = typeof(Ref<>);
-//      idProperty = nameof(Ref<IZeroIdEntity>.Id);
+//      idProperty = nameof(Ref<ZeroIdEntity>.Id);
 //    }
 
 
diff --git a/zero.Core/Validation/ApplicationValidator.cs b/zero.Core/Validation/ApplicationValidator.cs
index d0aab8cb..0cb9d810 100644
--- a/zero.Core/Validation/ApplicationValidator.cs
+++ b/zero.Core/Validation/ApplicationValidator.cs
@@ -4,7 +4,7 @@ using zero.Core.Extensions;
 
 namespace zero.Core.Validation
 {
-  public class ApplicationValidator : ZeroValidator<IApplication>
+  public class ApplicationValidator : ZeroValidator<Application>
   {
     public ApplicationValidator()
     {
diff --git a/zero.Core/Validation/BackofficeUserValidator.cs b/zero.Core/Validation/BackofficeUserValidator.cs
index 8a99818f..796781a4 100644
--- a/zero.Core/Validation/BackofficeUserValidator.cs
+++ b/zero.Core/Validation/BackofficeUserValidator.cs
@@ -4,7 +4,7 @@ using zero.Core.Extensions;
 
 namespace zero.Core.Validation
 {
-  public class BackofficeUserValidator : ZeroValidator<IBackofficeUser>
+  public class BackofficeUserValidator : ZeroValidator<BackofficeUser>
   {
     public BackofficeUserValidator(bool isCreate = false)
     {
diff --git a/zero.Core/Validation/PageValidator.cs b/zero.Core/Validation/PageValidator.cs
index 742b5218..b9e78424 100644
--- a/zero.Core/Validation/PageValidator.cs
+++ b/zero.Core/Validation/PageValidator.cs
@@ -4,7 +4,7 @@ using zero.Core.Entities;
 
 namespace zero.Core.Validation
 {
-  public class PageValidator : ZeroValidator<IPage>
+  public class PageValidator : ZeroValidator<Page>
   {
     public PageValidator()
     {
diff --git a/zero.Core/Validation/UserRoleValidator.cs b/zero.Core/Validation/UserRoleValidator.cs
index e90eb872..e0b84f84 100644
--- a/zero.Core/Validation/UserRoleValidator.cs
+++ b/zero.Core/Validation/UserRoleValidator.cs
@@ -6,7 +6,7 @@ using System;
 
 namespace zero.Core.Validation
 {
-  public class UserRoleValidator : ZeroValidator<IBackofficeUserRole>
+  public class UserRoleValidator : ZeroValidator<BackofficeUserRole>
   {
     const string SECTION_CLAIM = "section.";
 
@@ -20,7 +20,7 @@ namespace zero.Core.Validation
 
       RuleFor(x => x.Claims).NotEmpty().Must((role, claims, context) =>
       {
-        foreach (IUserClaim claim in claims)
+        foreach (UserClaim claim in claims)
         {
           if (claim.Value.StartsWith(SECTION_CLAIM, StringComparison.InvariantCultureIgnoreCase) && claim.Value.EndsWith(TRUE_CLAIM_VALUE, StringComparison.InvariantCultureIgnoreCase))
           {
diff --git a/zero.Core/ZeroContext.cs b/zero.Core/ZeroContext.cs
index 5a12ab01..acc9e746 100644
--- a/zero.Core/ZeroContext.cs
+++ b/zero.Core/ZeroContext.cs
@@ -16,7 +16,7 @@ namespace zero.Core
   public class ZeroContext : IZeroContext
   {
     /// <inheritdoc />
-    public IApplication Application { get; protected set; }
+    public Application Application { get; protected set; }
 
     /// <inheritdoc />
     public string AppId { get; protected set; }
@@ -31,7 +31,7 @@ namespace zero.Core
     public IZeroOptions Options { get; protected set; }
 
     /// <inheritdoc />
-    public IRoute Route { get; private set; }
+    public Route Route { get; private set; }
 
     /// <inheritdoc />
     public IResolvedRoute ResolvedRoute { get; private set; }
@@ -117,7 +117,7 @@ namespace zero.Core
     /// <summary>
     /// Currently loaded application
     /// </summary>
-    IApplication Application { get; }
+    Application Application { get; }
 
     /// <summary>
     /// Current loaded application Id
@@ -147,7 +147,7 @@ namespace zero.Core
     /// <summary>
     /// Matching (frontend) path route
     /// </summary>
-    IRoute Route { get; }
+    Route Route { get; }
 
     /// <summary>
     /// Matching (frontend) resolved route
diff --git a/zero.Core/zero.Core.csproj b/zero.Core/zero.Core.csproj
index 5970ca0d..a3553078 100644
--- a/zero.Core/zero.Core.csproj
+++ b/zero.Core/zero.Core.csproj
@@ -8,6 +8,12 @@
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Remove="Entities\Messages\**" />
+    <EmbeddedResource Remove="Entities\Messages\**" />
+    <None Remove="Entities\Messages\**" />
+  </ItemGroup>
+
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
@@ -27,7 +33,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Folder Include="Entities\Messages\Applications\" />
     <Folder Include="Numbers\" />
   </ItemGroup>
 
diff --git a/zero.Web.UI/app/core/editor.ts b/zero.Web.UI/app/core/editor.ts
index f86e0a62..2277e4a5 100644
--- a/zero.Web.UI/app/core/editor.ts
+++ b/zero.Web.UI/app/core/editor.ts
@@ -146,7 +146,7 @@ class Editor
 
 
   /**
-   * Adds an info tab to the editor which outputs data for IZeroEntity.
+   * Adds an info tab to the editor which outputs data for ZeroEntity.
    * This won't work as expected for other entities as they probably do not have required properties defined.
    * @returns {EditorTab}
    */
diff --git a/zero.Web/Controllers/ApplicationsController.cs b/zero.Web/Controllers/ApplicationsController.cs
index 1f978609..4f41f704 100644
--- a/zero.Web/Controllers/ApplicationsController.cs
+++ b/zero.Web/Controllers/ApplicationsController.cs
@@ -19,28 +19,28 @@ namespace zero.Web.Controllers
     }
 
 
-    public EditModel<IApplication> GetEmpty([FromServices] IApplication blueprint) => Edit(blueprint);
+    public EditModel<Application> GetEmpty([FromServices] Application blueprint) => Edit(blueprint);
 
 
-    public async Task<EditModel<IApplication>> GetById([FromQuery] string id) => Edit(await Api.GetById(id));
+    public async Task<EditModel<Application>> GetById([FromQuery] string id) => Edit(await Api.GetById(id));
 
 
-    public async Task<IList<IApplication>> GetAll() => await Api.GetAll();
+    public async Task<IList<Application>> GetAll() => await Api.GetAll();
 
 
-    public async Task<ListResult<IApplication>> GetByQuery([FromQuery] ListBackofficeQuery<IApplication> query) => await Api.GetByQuery(query);
+    public async Task<ListResult<Application>> GetByQuery([FromQuery] ListBackofficeQuery<Application> query) => await Api.GetByQuery(query);
 
 
-    public IReadOnlyCollection<IFeature> GetAllFeatures() => Options.Features.GetAllItems();
+    public IReadOnlyCollection<Feature> GetAllFeatures() => Options.Features.GetAllItems();
 
 
     [HttpPost]
     [ZeroAuthorize(Permissions.Settings.Applications, PermissionsValue.Update)]
-    public async Task<EntityResult<IApplication>> Save([FromBody] IApplication model) => await Api.Save(model);
+    public async Task<EntityResult<Application>> Save([FromBody] Application model) => await Api.Save(model);
 
 
     [HttpDelete]
     [ZeroAuthorize(Permissions.Settings.Applications, PermissionsValue.Update)]
-    public async Task<EntityResult<IApplication>> Delete([FromQuery] string id) => await Api.Delete(id);
+    public async Task<EntityResult<Application>> Delete([FromQuery] string id) => await Api.Delete(id);
   }
 }
diff --git a/zero.Web/Controllers/BackofficeCollectionController.cs b/zero.Web/Controllers/BackofficeCollectionController.cs
index 17e93d9d..4d0ae8e3 100644
--- a/zero.Web/Controllers/BackofficeCollectionController.cs
+++ b/zero.Web/Controllers/BackofficeCollectionController.cs
@@ -12,7 +12,7 @@ using zero.Web.Models;
 namespace zero.Web.Controllers
 {
   public abstract class BackofficeCollectionController<TEntity, TCollection> : BackofficeController 
-    where TEntity : IZeroEntity 
+    where TEntity : ZeroEntity 
     where TCollection : ICollectionBase<TEntity>
   {
     protected TCollection Collection { get; private set; }
diff --git a/zero.Web/Controllers/BackofficeController.cs b/zero.Web/Controllers/BackofficeController.cs
index f238e491..b44c09b8 100644
--- a/zero.Web/Controllers/BackofficeController.cs
+++ b/zero.Web/Controllers/BackofficeController.cs
@@ -38,7 +38,7 @@ namespace zero.Web.Controllers
     /// <summary>
     /// Creates an edit model with appropriate options and permissions
     /// </summary>
-    public EditModel<T> Edit<T>(T data, bool typed = true, Action<EditModel<T>> transform = null) where T : IZeroIdEntity
+    public EditModel<T> Edit<T>(T data, bool typed = true, Action<EditModel<T>> transform = null) where T : ZeroIdEntity
     {
       Type type = typeof(T);
 
@@ -69,7 +69,7 @@ namespace zero.Web.Controllers
     /// Creates an edit model with appropriate options and permissions
     /// </summary>
     public TWrapper Edit<T, TWrapper>(TWrapper data, bool typed = true, Action<EditModel<T>> transform = null) 
-      where T : IZeroIdEntity
+      where T : ZeroIdEntity
       where TWrapper : EditModel<T>, new() 
     {
       Type type = typeof(T);
@@ -119,7 +119,7 @@ namespace zero.Web.Controllers
     }
 
 
-    public IList<PreviewModel> Previews<T>(Dictionary<string, T> items, Action<T, PreviewModel> transform = null) where T : IZeroEntity
+    public IList<PreviewModel> Previews<T>(Dictionary<string, T> items, Action<T, PreviewModel> transform = null) where T : ZeroEntity
     {
       IList<PreviewModel> previews = new List<PreviewModel>();
 
@@ -155,7 +155,7 @@ namespace zero.Web.Controllers
 
 
 
-    public async Task<IList<SelectModel>> SelectList<T>(IAsyncEnumerable<T> enumerable, Action<T, SelectModel> transform = null) where T : IZeroEntity
+    public async Task<IList<SelectModel>> SelectList<T>(IAsyncEnumerable<T> enumerable, Action<T, SelectModel> transform = null) where T : ZeroEntity
     {
       List<SelectModel> items = new List<SelectModel>();
 
diff --git a/zero.Web/Controllers/CountriesController.cs b/zero.Web/Controllers/CountriesController.cs
index cdfe9692..4d4e6459 100644
--- a/zero.Web/Controllers/CountriesController.cs
+++ b/zero.Web/Controllers/CountriesController.cs
@@ -7,7 +7,7 @@ using zero.Core.Identity;
 namespace zero.Web.Controllers
 {
   [ZeroAuthorize(Permissions.Settings.Countries, PermissionsValue.Read)]
-  public class CountriesController : BackofficeCollectionController<ICountry, ICountriesCollection>
+  public class CountriesController : BackofficeCollectionController<Country, ICountriesCollection>
   {
     public CountriesController(ICountriesCollection collection) : base(collection)
     {
diff --git a/zero.Web/Controllers/IntegrationsController.cs b/zero.Web/Controllers/IntegrationsController.cs
index fc709413..8c2d3387 100644
--- a/zero.Web/Controllers/IntegrationsController.cs
+++ b/zero.Web/Controllers/IntegrationsController.cs
@@ -21,25 +21,25 @@ namespace zero.Web.Controllers
     }
 
 
-    public EditModel<IIntegration> GetEmpty([FromQuery] string alias) => Edit(Collection.GetEmpty(alias));
+    public EditModel<Integration> GetEmpty([FromQuery] string alias) => Edit(Collection.GetEmpty(alias));
 
 
-    public async Task<EditModel<IIntegration>> GetByAlias([FromQuery] string alias) => Edit(await Collection.GetByAlias(alias));
+    public async Task<EditModel<Integration>> GetByAlias([FromQuery] string alias) => Edit(await Collection.GetByAlias(alias));
 
 
-    public async Task<ListResult<IIntegration>> GetByQuery([FromQuery] ListQuery<IIntegration> query) => await Collection.GetByQuery(query);
+    public async Task<ListResult<Integration>> GetByQuery([FromQuery] ListQuery<Integration> query) => await Collection.GetByQuery(query);
 
 
     public async Task<IList<IntegrationTypeWithStatus>> GetTypes() => await Collection.GetTypesWithStatus();
 
 
     [HttpPost]
-    public async Task<EntityResult<IIntegration>> Save([FromBody] IIntegration model) => await Collection.Save(model);
+    public async Task<EntityResult<Integration>> Save([FromBody] Integration model) => await Collection.Save(model);
 
     [HttpPost]
-    public async Task<EntityResult<IIntegration>> SaveActiveState([FromBody] Integration model) => model.IsActive ? await Collection.Activate(model.Alias) : await Collection.Deactivate(model.Alias);
+    public async Task<EntityResult<Integration>> SaveActiveState([FromBody] Integration model) => model.IsActive ? await Collection.Activate(model.Alias) : await Collection.Deactivate(model.Alias);
 
     [HttpDelete]
-    public async Task<EntityResult<IIntegration>> Delete([FromQuery] string alias) => await Collection.Delete(alias);
+    public async Task<EntityResult<Integration>> Delete([FromQuery] string alias) => await Collection.Delete(alias);
   }
 }
\ No newline at end of file
diff --git a/zero.Web/Controllers/LanguagesController.cs b/zero.Web/Controllers/LanguagesController.cs
index e3970969..3737953d 100644
--- a/zero.Web/Controllers/LanguagesController.cs
+++ b/zero.Web/Controllers/LanguagesController.cs
@@ -8,7 +8,7 @@ using zero.Core.Identity;
 namespace zero.Web.Controllers
 {
   [ZeroAuthorize(Permissions.Settings.Languages, PermissionsValue.Read)]
-  public class LanguagesController : BackofficeCollectionController<ILanguage, ILanguagesCollection>
+  public class LanguagesController : BackofficeCollectionController<Language, ILanguagesCollection>
   {
     public LanguagesController(ILanguagesCollection collection) : base(collection)
     {
diff --git a/zero.Web/Controllers/MailTemplatesController.cs b/zero.Web/Controllers/MailTemplatesController.cs
index 7b114491..51c1c243 100644
--- a/zero.Web/Controllers/MailTemplatesController.cs
+++ b/zero.Web/Controllers/MailTemplatesController.cs
@@ -5,7 +5,7 @@ using zero.Core.Identity;
 namespace zero.Web.Controllers
 {
   [ZeroAuthorize(Permissions.Settings.Mails, PermissionsValue.Read)]
-  public class MailTemplatesController : BackofficeCollectionController<IMailTemplate, IMailTemplatesCollection>
+  public class MailTemplatesController : BackofficeCollectionController<MailTemplate, IMailTemplatesCollection>
   {
     public MailTemplatesController(IMailTemplatesCollection collection) : base(collection)
     {
diff --git a/zero.Web/Controllers/MediaController.cs b/zero.Web/Controllers/MediaController.cs
index b155eb28..3d61e1d0 100644
--- a/zero.Web/Controllers/MediaController.cs
+++ b/zero.Web/Controllers/MediaController.cs
@@ -17,7 +17,7 @@ using zero.Web.Models;
 namespace zero.Web.Controllers
 {
   [ZeroAuthorize(Permissions.Sections.Media, PermissionsValue.True)]
-  public class MediaController : BackofficeCollectionController<IMedia, IMediaCollection>
+  public class MediaController : BackofficeCollectionController<Media, IMediaCollection>
   {
     IMediaFolderApi MediaFolderApi;
     IPaths Paths;
@@ -38,13 +38,13 @@ namespace zero.Web.Controllers
 
 
     [HttpPost]
-    public async Task<EntityResult<IMedia>> Upload(IFormFile file, [FromForm] string folderId) => await Collection.Save(await Collection.Upload(file, folderId));
+    public async Task<EntityResult<Media>> Upload(IFormFile file, [FromForm] string folderId) => await Collection.Save(await Collection.Upload(file, folderId));
 
     [HttpPost]
     public async Task<Media> UploadTemporary(IFormFile file, [FromForm] string folderId) => await Collection.Upload(file, folderId);
 
     [HttpPost]
-    public async Task<EntityResult<IMedia>> Move([FromBody] ActionCopyModel model) => await Collection.Move(model.Id, model.DestinationId);
+    public async Task<EntityResult<Media>> Move([FromBody] ActionCopyModel model) => await Collection.Move(model.Id, model.DestinationId);
 
 
     public async Task<MediaListResultModel> GetAll([FromQuery] MediaListQuery query)
@@ -60,8 +60,8 @@ namespace zero.Web.Controllers
         Type = x.Type
       });
 
-      IList<IMediaFolder> hierarchy = null;
-      IMediaFolder folder = null;
+      IList<MediaFolder> hierarchy = null;
+      MediaFolder folder = null;
 
       if (!String.IsNullOrEmpty(query.FolderId))
       {
diff --git a/zero.Web/Controllers/MediaFolderController.cs b/zero.Web/Controllers/MediaFolderController.cs
index c451156e..3ec586d5 100644
--- a/zero.Web/Controllers/MediaFolderController.cs
+++ b/zero.Web/Controllers/MediaFolderController.cs
@@ -19,25 +19,25 @@ namespace zero.Web.Controllers
     }
 
 
-    public async Task<EditModel<IMediaFolder>> GetById([FromQuery] string id) => Edit(await Api.GetById(id));
+    public async Task<EditModel<MediaFolder>> GetById([FromQuery] string id) => Edit(await Api.GetById(id));
 
 
-    public EditModel<IMediaFolder> GetEmpty([FromServices] IMediaFolder blueprint) => Edit(blueprint);
+    public EditModel<MediaFolder> GetEmpty([FromServices] MediaFolder blueprint) => Edit(blueprint);
 
 
-    public async Task<IList<IMediaFolder>> GetHierarchy([FromQuery] string id) => await Api.GetHierarchy(id);
+    public async Task<IList<MediaFolder>> GetHierarchy([FromQuery] string id) => await Api.GetHierarchy(id);
 
 
     public async Task<IList<TreeItem>> GetAllAsTree([FromQuery] string parent = null, [FromQuery] string active = null) => await Api.GetAllAsTree(parent, active);
 
 
     [HttpPost]
-    public async Task<EntityResult<IMediaFolder>> Move([FromBody] ActionCopyModel model) => await Api.Move(model.Id, model.DestinationId);
+    public async Task<EntityResult<MediaFolder>> Move([FromBody] ActionCopyModel model) => await Api.Move(model.Id, model.DestinationId);
 
 
-    public async Task<EntityResult<IMediaFolder>> Save([FromBody] IMediaFolder model) => await Api.Save(model);
+    public async Task<EntityResult<MediaFolder>> Save([FromBody] MediaFolder model) => await Api.Save(model);
 
 
-    public async Task<EntityResult<IMediaFolder>> Delete([FromQuery] string id) => await Api.Delete(id);
+    public async Task<EntityResult<MediaFolder>> Delete([FromQuery] string id) => await Api.Delete(id);
   }
 }
diff --git a/zero.Web/Controllers/ModulesController.cs b/zero.Web/Controllers/ModulesController.cs
index 0643d4bb..29252a78 100644
--- a/zero.Web/Controllers/ModulesController.cs
+++ b/zero.Web/Controllers/ModulesController.cs
@@ -25,10 +25,10 @@ namespace zero.Web.Controllers
     public ModuleType GetModuleType([FromQuery] string alias) => Api.GetModuleType(alias);
 
 
-    public EditModel<IModule> GetEmpty(string alias)
+    public EditModel<Module> GetEmpty(string alias)
     {
       ModuleType moduleType = Api.GetModuleType(alias);
-      IModule module = Activator.CreateInstance(moduleType.ContentType) as IModule;
+      Module module = Activator.CreateInstance(moduleType.ContentType) as Module;
 
       module.ModuleTypeAlias = moduleType.Alias;
       module.Id = IdGenerator.Create(8);
diff --git a/zero.Web/Controllers/PagesController.cs b/zero.Web/Controllers/PagesController.cs
index 4e40fa22..9863e259 100644
--- a/zero.Web/Controllers/PagesController.cs
+++ b/zero.Web/Controllers/PagesController.cs
@@ -31,25 +31,25 @@ namespace zero.Web.Controllers
  
     public PageType GetPageType([FromQuery] string alias) => Api.GetPageType(alias);
 
-    public async Task<PageEditModel<IPage>> GetById([FromQuery] string id)
+    public async Task<PageEditModel<Page>> GetById([FromQuery] string id)
     {
-      IPage entity = await Api.GetById(id);
+      Page entity = await Api.GetById(id);
 
       if (entity == null)
       {
         return null;
       }
 
-      return Edit<IPage, PageEditModel<IPage>>(new PageEditModel<IPage>()
+      return Edit<Page, PageEditModel<Page>>(new PageEditModel<Page>()
       {
         Entity = entity,
-        //Revisions = await RevisionsApi.GetPaged<IPage>(id),
+        //Revisions = await RevisionsApi.GetPaged<Page>(id),
         PageType = Api.GetPageType(entity.PageTypeAlias)
       });
     }
 
 
-    public async Task<EditModel<IPage>> GetEmpty([FromQuery] string type, [FromQuery] string parent = null)
+    public async Task<EditModel<Page>> GetEmpty([FromQuery] string type, [FromQuery] string parent = null)
     {
       return Edit(await Api.GetEmpty(type, parent));
     }
@@ -61,13 +61,13 @@ namespace zero.Web.Controllers
 
       using IAsyncDocumentSession session = Store.OpenAsyncSession();
 
-      Dictionary<string, IPage> pages = await session.LoadAsync<IPage>(ids);
-      Dictionary<string, IRoute> routes = await session.LoadAsync<IRoute>(pages.Where(x => x.Value != null).Select(x => "routes." + x.Value.Hash));
+      Dictionary<string, Page> pages = await session.LoadAsync<Page>(ids);
+      Dictionary<string, Route> routes = await session.LoadAsync<Route>(pages.Where(x => x.Value != null).Select(x => "routes." + x.Value.Hash));
 
       return Previews(pages, item =>
       {
         PageType pageType = pageTypes.FirstOrDefault(x => x.Alias == item.PageTypeAlias);
-        IRoute route = null;
+        Route route = null;
 
         if (!routes.TryGetValue("routes." + item.Hash, out route) || route == null)
         {
@@ -88,22 +88,22 @@ namespace zero.Web.Controllers
     }
 
 
-    public async Task<ListResult<Revision>> GetRevisions([FromQuery] string id, [FromQuery] int page = 1) => await RevisionsApi.GetPaged<IPage>(id, page);
+    public async Task<ListResult<Revision>> GetRevisions([FromQuery] string id, [FromQuery] int page = 1) => await RevisionsApi.GetPaged<Page>(id, page);
 
 
-    public async Task<EntityResult<IPage>> Save([FromBody] IPage model) => await Api.Save(model);
+    public async Task<EntityResult<Page>> Save([FromBody] Page model) => await Api.Save(model);
 
 
     [HttpPost]
-    public async Task<EntityResult<IList<IPage>>> SaveSorting([FromBody] string[] ids) => await Api.SaveSorting(ids);
+    public async Task<EntityResult<IList<Page>>> SaveSorting([FromBody] string[] ids) => await Api.SaveSorting(ids);
 
 
     [HttpPost]
-    public async Task<EntityResult<IPage>> Move([FromBody] ActionCopyModel model) => await Api.Move(model.Id, model.DestinationId);
+    public async Task<EntityResult<Page>> Move([FromBody] ActionCopyModel model) => await Api.Move(model.Id, model.DestinationId);
 
 
     [HttpPost]
-    public async Task<EntityResult<IPage>> Copy([FromBody] ActionCopyModel model) => await Api.Copy(model.Id, model.DestinationId, model.IncludeDescendants);
+    public async Task<EntityResult<Page>> Copy([FromBody] ActionCopyModel model) => await Api.Copy(model.Id, model.DestinationId, model.IncludeDescendants);
 
 
     [HttpPost]
diff --git a/zero.Web/Controllers/PreviewController.cs b/zero.Web/Controllers/PreviewController.cs
index fd098bee..e1f25d1b 100644
--- a/zero.Web/Controllers/PreviewController.cs
+++ b/zero.Web/Controllers/PreviewController.cs
@@ -16,19 +16,19 @@ namespace zero.Web.Controllers
     }
 
 
-    public async Task<EditModel<IPreview>> GetById([FromQuery] string id) => Edit(await Api.GetById(id));
+    public async Task<EditModel<Preview>> GetById([FromQuery] string id) => Edit(await Api.GetById(id));
 
 
-    public async Task<EntityResult<string>> Add([FromBody] IZeroEntity model)
+    public async Task<EntityResult<string>> Add([FromBody] ZeroEntity model)
     {
-      EntityResult<IPreview> preview = await Api.Add(model);
+      EntityResult<Preview> preview = await Api.Add(model);
       return EntityResult<string>.From(preview, preview.Model?.Id);
     }
 
 
-    public async Task<EntityResult<string>> Update([FromQuery] string id, [FromBody] IZeroEntity model)
+    public async Task<EntityResult<string>> Update([FromQuery] string id, [FromBody] ZeroEntity model)
     {
-      EntityResult<IPreview> preview = await Api.Update(id, model);
+      EntityResult<Preview> preview = await Api.Update(id, model);
       return EntityResult<string>.From(preview, id);
     }
   }
diff --git a/zero.Web/Controllers/RecycleBinController.cs b/zero.Web/Controllers/RecycleBinController.cs
index d86282d7..3c44e316 100644
--- a/zero.Web/Controllers/RecycleBinController.cs
+++ b/zero.Web/Controllers/RecycleBinController.cs
@@ -15,7 +15,7 @@ namespace zero.Web.Controllers
     }
 
 
-    public async Task<ListResult<IRecycledEntity>> GetByQuery([FromQuery] RecycleBinListQuery query)
+    public async Task<ListResult<RecycledEntity>> GetByQuery([FromQuery] RecycleBinListQuery query)
     {
       query.IncludeInactive = true;
       return await Api.GetByQuery(query);
@@ -26,11 +26,11 @@ namespace zero.Web.Controllers
 
 
     [HttpDelete]
-    public async Task<EntityResult<IRecycledEntity>> Delete([FromQuery] string id) => await Api.Delete(id);
+    public async Task<EntityResult<RecycledEntity>> Delete([FromQuery] string id) => await Api.Delete(id);
 
 
     [HttpDelete]
-    public async Task<EntityResult<IRecycledEntity>> DeleteByGroup([FromQuery] string group) => await Api.DeleteByGroup(group);
+    public async Task<EntityResult<RecycledEntity>> DeleteByGroup([FromQuery] string group) => await Api.DeleteByGroup(group);
 
   }
 }
diff --git a/zero.Web/Controllers/SettingsController.cs b/zero.Web/Controllers/SettingsController.cs
index 670e8e94..54b57cfe 100644
--- a/zero.Web/Controllers/SettingsController.cs
+++ b/zero.Web/Controllers/SettingsController.cs
@@ -67,7 +67,7 @@ namespace zero.Web.Controllers
         }
       }
 
-      IList<IApplication> applications = new List<IApplication>();
+      IList<Application> applications = new List<Application>();
 
       if (Permission.CanReadKey(permissions, Permissions.Settings.Applications, false))
       {
diff --git a/zero.Web/Controllers/SpacesController.cs b/zero.Web/Controllers/SpacesController.cs
index e9382b31..b12ef485 100644
--- a/zero.Web/Controllers/SpacesController.cs
+++ b/zero.Web/Controllers/SpacesController.cs
@@ -35,7 +35,7 @@ namespace zero.Web.Controllers
     public List<Space> GetAll() => Api.GetAll().Where(space => CanReadSpace(space.Alias)).ToList();
 
 
-    public async Task<IActionResult> GetList([FromQuery] string alias, [FromQuery] ListBackofficeQuery<ISpaceContent> query = null)
+    public async Task<IActionResult> GetList([FromQuery] string alias, [FromQuery] ListBackofficeQuery<SpaceContent> query = null)
     {
       if (!CanReadSpace(alias))
       {
@@ -54,7 +54,7 @@ namespace zero.Web.Controllers
       }
 
       Space space = Api.GetByAlias(alias);
-      ISpaceContent model = null;
+      SpaceContent model = null;
 
       if (space == null)
       {
@@ -79,7 +79,7 @@ namespace zero.Web.Controllers
     /// <summary>
     /// Save content item
     /// </summary>
-    public async Task<IActionResult> Save([FromBody] ISpaceContent model)
+    public async Task<IActionResult> Save([FromBody] SpaceContent model)
     {
       if (!CanWriteSpace(model.SpaceAlias))
       {
diff --git a/zero.Web/Controllers/TranslationsController.cs b/zero.Web/Controllers/TranslationsController.cs
index 1a2e0b85..ac760c4a 100644
--- a/zero.Web/Controllers/TranslationsController.cs
+++ b/zero.Web/Controllers/TranslationsController.cs
@@ -10,13 +10,13 @@ using zero.Core.Identity;
 namespace zero.Web.Controllers
 {
   [ZeroAuthorize(Permissions.Settings.Translations, PermissionsValue.Read)]
-  public class TranslationsController : BackofficeCollectionController<ITranslation, ITranslationsCollection>
+  public class TranslationsController : BackofficeCollectionController<Translation, ITranslationsCollection>
   {
     public TranslationsController(ITranslationsCollection collection) : base(collection)
     {
     }
 
-    public override async Task<ListResult<ITranslation>> GetByQuery([FromQuery] ListBackofficeQuery<ITranslation> query)
+    public override async Task<ListResult<Translation>> GetByQuery([FromQuery] ListBackofficeQuery<Translation> query)
     {
       query.SearchFor(entity => entity.Key, entity => entity.Value);
       return await Collection.Query.OrderByDescending(x => x.CreatedDate).ToQueriedListAsync(query);
diff --git a/zero.Web/Controllers/UserRolesController.cs b/zero.Web/Controllers/UserRolesController.cs
index 50755c7c..48654796 100644
--- a/zero.Web/Controllers/UserRolesController.cs
+++ b/zero.Web/Controllers/UserRolesController.cs
@@ -22,20 +22,20 @@ namespace zero.Web.Controllers
     }
 
 
-    public async Task<EditModel<IBackofficeUserRole>> GetById([FromQuery] string id) => Edit(await Api.GetById(id));
+    public async Task<EditModel<BackofficeUserRole>> GetById([FromQuery] string id) => Edit(await Api.GetById(id));
 
 
-    public async Task<IList<IBackofficeUserRole>> GetAll() => await Api.GetAll();
+    public async Task<IList<BackofficeUserRole>> GetAll() => await Api.GetAll();
    
 
     public IList<PermissionCollection> GetAllPermissions() => PermissionsApi.GetAll();
 
 
     [ZeroAuthorize(Permissions.Settings.Users, PermissionsValue.Update)]
-    public async Task<EntityResult<IBackofficeUserRole>> Save([FromBody] IBackofficeUserRole model) => await Api.Save(model);
+    public async Task<EntityResult<BackofficeUserRole>> Save([FromBody] BackofficeUserRole model) => await Api.Save(model);
 
 
     [ZeroAuthorize(Permissions.Settings.Users, PermissionsValue.Update)]
-    public async Task<EntityResult<IBackofficeUserRole>> Delete([FromQuery] string id) => await Api.Delete(id);
+    public async Task<EntityResult<BackofficeUserRole>> Delete([FromQuery] string id) => await Api.Delete(id);
   }
 }
diff --git a/zero.Web/Controllers/UsersController.cs b/zero.Web/Controllers/UsersController.cs
index 6c5ae225..0a29435d 100644
--- a/zero.Web/Controllers/UsersController.cs
+++ b/zero.Web/Controllers/UsersController.cs
@@ -25,10 +25,10 @@ namespace zero.Web.Controllers
     }
 
 
-    public async Task<EditModel<IBackofficeUser>> GetById([FromQuery] string id) => Edit(await Api.GetUserById(id));
+    public async Task<EditModel<BackofficeUser>> GetById([FromQuery] string id) => Edit(await Api.GetUserById(id));
 
 
-    public async Task<ListResult<IBackofficeUser>> GetAll([FromQuery] ListBackofficeQuery<IBackofficeUser> query) => await Api.GetByQuery(query);
+    public async Task<ListResult<BackofficeUser>> GetAll([FromQuery] ListBackofficeQuery<BackofficeUser> query) => await Api.GetByQuery(query);
 
 
     public IList<PermissionCollection> GetAllPermissions() => PermissionsApi.GetAll();
@@ -54,18 +54,18 @@ namespace zero.Web.Controllers
 
 
     [ZeroAuthorize]
-    public async Task<EntityResult<IBackofficeUser>> UpdatePassword([FromBody] UserPasswordEditModel model)
+    public async Task<EntityResult<BackofficeUser>> UpdatePassword([FromBody] UserPasswordEditModel model)
     {
-      EntityResult<IBackofficeUser> result;
+      EntityResult<BackofficeUser> result;
 
       if (model.NewPassword != model.ConfirmNewPassword)
       {
-        result = EntityResult<IBackofficeUser>.Fail(nameof(model.NewPassword), "@errors.changepassword.newpasswordsnotmatching");
+        result = EntityResult<BackofficeUser>.Fail(nameof(model.NewPassword), "@errors.changepassword.newpasswordsnotmatching");
       }
       else
       {
         BackofficeUser user = await AuthenticationApi.GetUser();
-        result = await Api.UpdatePassword(user as IBackofficeUser, model.CurrentPassword, model.NewPassword);
+        result = await Api.UpdatePassword(user as BackofficeUser, model.CurrentPassword, model.NewPassword);
 
         if (result.IsSuccess)
         {
@@ -78,31 +78,31 @@ namespace zero.Web.Controllers
 
 
     [ZeroAuthorize(Permissions.Settings.Users, PermissionsValue.Update)]
-    public async Task<EntityResult<IBackofficeUser>> Disable([FromBody] IBackofficeUser model)
+    public async Task<EntityResult<BackofficeUser>> Disable([FromBody] BackofficeUser model)
     {
-      IBackofficeUser entity = await Api.GetUserById(model.Id);
+      BackofficeUser entity = await Api.GetUserById(model.Id);
       return await Api.Disable(entity);
     }
 
 
     [ZeroAuthorize(Permissions.Settings.Users, PermissionsValue.Update)]
-    public async Task<EntityResult<IBackofficeUser>> Enable([FromBody] IBackofficeUser model)
+    public async Task<EntityResult<BackofficeUser>> Enable([FromBody] BackofficeUser model)
     {
-      IBackofficeUser entity = await Api.GetUserById(model.Id);
+      BackofficeUser entity = await Api.GetUserById(model.Id);
       return await Api.Enable(entity);
     }
 
 
     [ZeroAuthorize(Permissions.Settings.Users, PermissionsValue.Update)]
-    public async Task<EntityResult<IBackofficeUser>> Save([FromBody] IBackofficeUser model) => await Api.Save(model);
+    public async Task<EntityResult<BackofficeUser>> Save([FromBody] BackofficeUser model) => await Api.Save(model);
 
 
     [ZeroAuthorize(Permissions.Settings.Users, PermissionsValue.Update)]
     // TODO do not need settings.users authorization for editing current user profiles
-    public async Task<EntityResult<IBackofficeUser>> SaveCurrent([FromBody] IBackofficeUser model) => await Api.Save(model);
+    public async Task<EntityResult<BackofficeUser>> SaveCurrent([FromBody] BackofficeUser model) => await Api.Save(model);
 
 
     [ZeroAuthorize(Permissions.Settings.Users, PermissionsValue.Update)]
-    public async Task<EntityResult<IBackofficeUser>> Delete([FromQuery] string id) => await Api.Delete(id);
+    public async Task<EntityResult<BackofficeUser>> Delete([FromQuery] string id) => await Api.Delete(id);
   }
 }
diff --git a/zero.Web/Controllers/ZeroController.cs b/zero.Web/Controllers/ZeroController.cs
index 5581571e..2c1cb6d7 100644
--- a/zero.Web/Controllers/ZeroController.cs
+++ b/zero.Web/Controllers/ZeroController.cs
@@ -17,7 +17,7 @@ namespace zero.Web.Controllers
 
   public abstract class ZeroController<T> : Controller where T : IResolvedRoute
   {
-    protected IApplication Application { get; set; }
+    protected Application Application { get; set; }
 
     protected virtual T Route { get; set; }
 
diff --git a/zero.Web/Defaults/ZeroBackofficePlugin.cs b/zero.Web/Defaults/ZeroBackofficePlugin.cs
index 0b37255b..f3a07945 100644
--- a/zero.Web/Defaults/ZeroBackofficePlugin.cs
+++ b/zero.Web/Defaults/ZeroBackofficePlugin.cs
@@ -58,27 +58,27 @@ namespace zero.Web.Defaults
 
       services.AddScoped<IRazorRenderer, RazorRenderer>();
 
-      services.AddTransient<IApplication, Application>();
-      services.AddTransient<ICountry, Country>();
-      services.AddTransient<ILanguage, Language>();
-      services.AddTransient<ITranslation, Translation>();
-      services.AddTransient<IPage, Page>();
-      services.AddTransient<IRecycledEntity, RecycledEntity>();
-      services.AddTransient<IMedia, Media>();
-      services.AddTransient<IMediaFolder, MediaFolder>();
-      services.AddTransient<IPreview, Preview>();
-      services.AddTransient<IRoute, Route>();
+      services.AddTransient<Application, Application>();
+      services.AddTransient<Country, Country>();
+      services.AddTransient<Language, Language>();
+      services.AddTransient<Translation, Translation>();
+      services.AddTransient<Page, Page>();
+      services.AddTransient<RecycledEntity, RecycledEntity>();
+      services.AddTransient<Media, Media>();
+      services.AddTransient<MediaFolder, MediaFolder>();
+      services.AddTransient<Preview, Preview>();
+      services.AddTransient<Route, Route>();
 
-      services.AddTransient<IValidator<IApplication>, ApplicationValidator>();
-      services.AddTransient<IValidator<ICountry>, CountryValidator>();
-      services.AddTransient<IValidator<IMailTemplate>, MailTemplateValidator>();
-      services.AddTransient<IValidator<ILanguage>, LanguageValidator>();
-      services.AddTransient<IValidator<ITranslation>, TranslationValidator>();
-      services.AddTransient<IValidator<IPage>, PageValidator>();
-      services.AddTransient<IValidator<IMedia>, MediaValidator>();
-      services.AddTransient<IValidator<IMediaFolder>, MediaFolderValidator>();
-      services.AddTransient<IValidator<IBackofficeUserRole>, UserRoleValidator>();
-      services.AddTransient<IValidator<IBackofficeUser>, BackofficeUserValidator>();
+      services.AddTransient<IValidator<Application>, ApplicationValidator>();
+      services.AddTransient<IValidator<Country>, CountryValidator>();
+      services.AddTransient<IValidator<MailTemplate>, MailTemplateValidator>();
+      services.AddTransient<IValidator<Language>, LanguageValidator>();
+      services.AddTransient<IValidator<Translation>, TranslationValidator>();
+      services.AddTransient<IValidator<Page>, PageValidator>();
+      services.AddTransient<IValidator<Media>, MediaValidator>();
+      services.AddTransient<IValidator<MediaFolder>, MediaFolderValidator>();
+      services.AddTransient<IValidator<BackofficeUserRole>, UserRoleValidator>();
+      services.AddTransient<IValidator<BackofficeUser>, BackofficeUserValidator>();
 
       services.AddTransient<IApplicationsApi, ApplicationsApi>();
       services.AddTransient<ICountriesCollection, CountriesCollection>();
diff --git a/zero.Web/Filters/ZeroBackofficeAttribute.cs b/zero.Web/Filters/ZeroBackofficeAttribute.cs
index 0264daab..2aed6f38 100644
--- a/zero.Web/Filters/ZeroBackofficeAttribute.cs
+++ b/zero.Web/Filters/ZeroBackofficeAttribute.cs
@@ -36,7 +36,7 @@
 
 //        if (result != null)
 //        {
-//          IZeroEntity model = result.Value as IZeroEntity;
+//          ZeroEntity model = result.Value as ZeroEntity;
 
 //          if (model != null)
 //          {
diff --git a/zero.Web/Models/MediaListResultModel.cs b/zero.Web/Models/MediaListResultModel.cs
index 51ee14ba..2aebe262 100644
--- a/zero.Web/Models/MediaListResultModel.cs
+++ b/zero.Web/Models/MediaListResultModel.cs
@@ -7,16 +7,16 @@ namespace zero.Web.Models
   {
     public IEnumerable<MediaListModel> Folders { get; private set; }
 
-    public IEnumerable<IMediaFolder> FolderHierarchy { get; private set; }
+    public IEnumerable<MediaFolder> FolderHierarchy { get; private set; }
 
-    public IMediaFolder Folder { get; private set; }
+    public MediaFolder Folder { get; private set; }
 
     public MediaListResultModel(ListResult<MediaListModel> items, IEnumerable<MediaListModel> folders) : base(items.Items, items.TotalItems, items.Page, items.PageSize)
     {
       Folders = folders;
     }
 
-    public MediaListResultModel(ListResult<MediaListModel> items, IEnumerable<MediaListModel> folders, IMediaFolder currentFolder, IEnumerable<IMediaFolder> hierarchy) : this(items, folders)
+    public MediaListResultModel(ListResult<MediaListModel> items, IEnumerable<MediaListModel> folders, MediaFolder currentFolder, IEnumerable<MediaFolder> hierarchy) : this(items, folders)
     {
       Folder = currentFolder;
       FolderHierarchy = hierarchy;
diff --git a/zero.Web/Models/PageEditModel.cs b/zero.Web/Models/PageEditModel.cs
index 3557a542..2ce57be3 100644
--- a/zero.Web/Models/PageEditModel.cs
+++ b/zero.Web/Models/PageEditModel.cs
@@ -7,7 +7,7 @@ using zero.Core.Entities;
 
 namespace zero.Web.Models
 {
-  public class PageEditModel<T> : EditModel<T> where T : IPage
+  public class PageEditModel<T> : EditModel<T> where T : Page
   {
     public PageType PageType { get; set; }
 
diff --git a/zero.Web/Models/UserEditModel.cs b/zero.Web/Models/UserEditModel.cs
index 3425009b..40355974 100644
--- a/zero.Web/Models/UserEditModel.cs
+++ b/zero.Web/Models/UserEditModel.cs
@@ -20,7 +20,7 @@ namespace zero.Web.Models
 
     public List<string> Roles { get; set; } = new List<string>();
 
-    public List<IUserClaim> Claims { get; set; } = new List<IUserClaim>();
+    public List<UserClaim> Claims { get; set; } = new List<UserClaim>();
 
     public DateTimeOffset? LockoutEnd { get; set; }
 
diff --git a/zero.Web/Models/UserRoleEditModel.cs b/zero.Web/Models/UserRoleEditModel.cs
index 9f927e7e..1af40662 100644
--- a/zero.Web/Models/UserRoleEditModel.cs
+++ b/zero.Web/Models/UserRoleEditModel.cs
@@ -12,7 +12,7 @@ namespace zero.Web.Models
 
     public string Icon { get; set; }
 
-    // TODO use IUserClaim and resolve to default type
+    // TODO use UserClaim and resolve to default type
     // see here: http://www.dotnet-programming.com/post/2017/05/08/Aspnet-core-Deserializing-Json-with-Dependency-Injection.aspx
     public List<UserClaim> Claims { get; set; }
   }
diff --git a/zero.Web/Sections/DashboardSection.cs b/zero.Web/Sections/DashboardSection.cs
index 28722794..a3406762 100644
--- a/zero.Web/Sections/DashboardSection.cs
+++ b/zero.Web/Sections/DashboardSection.cs
@@ -7,7 +7,7 @@ namespace zero.Web.Sections
   /// <summary>
   /// The dashboard aggregates data from all sections
   /// </summary>
-  public class DashboardSection : ISection, IZeroInternal
+  public class DashboardSection : IInternalSection
   {
     /// <inheritdoc />
     public string Alias => Constants.Sections.Dashboard;
diff --git a/zero.Web/Sections/MediaSection.cs b/zero.Web/Sections/MediaSection.cs
index e1cb362c..9a5595d2 100644
--- a/zero.Web/Sections/MediaSection.cs
+++ b/zero.Web/Sections/MediaSection.cs
@@ -7,7 +7,7 @@ namespace zero.Web.Sections
   /// <summary>
   /// Media items (images, videos, documents) grouped in folders
   /// </summary>
-  public class MediaSection : ISection, IZeroInternal
+  public class MediaSection : IInternalSection
   {
     /// <inheritdoc />
     public string Alias => Constants.Sections.Media;
diff --git a/zero.Web/Sections/PagesSection.cs b/zero.Web/Sections/PagesSection.cs
index a602afd5..bd7d7be5 100644
--- a/zero.Web/Sections/PagesSection.cs
+++ b/zero.Web/Sections/PagesSection.cs
@@ -7,7 +7,7 @@ namespace zero.Web.Sections
   /// <summary>
   /// Manage the page tree in this section
   /// </summary>
-  public class PagesSection : ISection, IZeroInternal
+  public class PagesSection : IInternalSection
   {
     /// <inheritdoc />
     public string Alias => Constants.Sections.Pages;
diff --git a/zero.Web/Sections/SettingsSection.cs b/zero.Web/Sections/SettingsSection.cs
index 07d4239d..2d5204ee 100644
--- a/zero.Web/Sections/SettingsSection.cs
+++ b/zero.Web/Sections/SettingsSection.cs
@@ -7,7 +7,7 @@ namespace zero.Web.Sections
   /// <summary>
   /// Website and backoffice settings
   /// </summary>
-  public class SettingsSection : ISection, IZeroInternal
+  public class SettingsSection : IInternalSection
   {
     /// <inheritdoc />
     public string Alias => Constants.Sections.Settings;
diff --git a/zero.Web/Sections/SpacesSection.cs b/zero.Web/Sections/SpacesSection.cs
index ce62da6e..9ef08ea8 100644
--- a/zero.Web/Sections/SpacesSection.cs
+++ b/zero.Web/Sections/SpacesSection.cs
@@ -7,7 +7,7 @@ namespace zero.Web.Sections
   /// <summary>
   /// Global list entities
   /// </summary>
-  public class SpacesSection : ISection, IZeroInternal
+  public class SpacesSection : IInternalSection
   {
     /// <inheritdoc />
     public string Alias => Constants.Sections.Spaces;
diff --git a/zero.Web/Security/AuthenticationBuilderExtensions.cs b/zero.Web/Security/AuthenticationBuilderExtensions.cs
index d89d8f25..3de89cd9 100644
--- a/zero.Web/Security/AuthenticationBuilderExtensions.cs
+++ b/zero.Web/Security/AuthenticationBuilderExtensions.cs
@@ -8,7 +8,6 @@ using System.Threading.Tasks;
 using zero.Core;
 using zero.Core.Entities;
 using zero.Core.Extensions;
-using zero.Core.Identity;
 using zero.Core.Options;
 using zero.Core.Security;
 
@@ -17,14 +16,14 @@ namespace zero.Web.Security
   public static class AuthenticationBuilderExtensions
   {
     public static AuthenticationBuilder AddZeroBackofficeCookie<TUser, TRole>(this AuthenticationBuilder builder, Action<OptionsBuilder<CookieAuthenticationOptions>> setupAction = null)
-      where TUser : class, IBackofficeUser
-      where TRole : class, IBackofficeUserRole
+      where TUser : BackofficeUser
+      where TRole : BackofficeUserRole
     {
       return builder.AddCookie<TUser>(Constants.Auth.BackofficeScheme, Constants.Auth.BackofficeDisplayName, true, b =>
       {
         b.Configure<IZeroOptions>((options, zero) =>
         {
-          options.ExpireTimeSpan = TimeSpan.FromMinutes(30);
+          options.ExpireTimeSpan = TimeSpan.FromMinutes(90);
           options.Cookie.Name = Constants.Auth.BackofficeCookieName;
 
           options.CookieManager = new ContextualCookieManager((ctx, key) =>
@@ -49,8 +48,8 @@ namespace zero.Web.Security
 
 
     public static AuthenticationBuilder AddZeroCookie<TUser, TRole>(this AuthenticationBuilder builder, string scheme, string cookieDisplayName = null, Action<OptionsBuilder<CookieAuthenticationOptions>> setupAction = null)
-      where TUser : class, IIdentityUserWithRoles
-      where TRole : class, IIdentityUserRole
+      where TUser : ZeroIdentityUser
+      where TRole : ZeroIdentityRole
     {
       return builder.AddCookie<TUser>(scheme, cookieDisplayName, false, setupAction);
     }
@@ -58,7 +57,7 @@ namespace zero.Web.Security
 
 
     public static AuthenticationBuilder AddZeroCookie<TUser>(this AuthenticationBuilder builder, string scheme, string cookieDisplayName = null, Action<OptionsBuilder<CookieAuthenticationOptions>> setupAction = null)
-      where TUser : class, IIdentityUser
+      where TUser : ZeroIdentityUser
     {
       return builder.AddCookie<TUser>(scheme, cookieDisplayName, false, setupAction);
     }
@@ -66,7 +65,7 @@ namespace zero.Web.Security
 
 
     static AuthenticationBuilder AddCookie<TUser>(this AuthenticationBuilder builder, string scheme, string displayName, bool isBackoffice, Action<OptionsBuilder<CookieAuthenticationOptions>> setupAction = null)
-      where TUser : class, IIdentityUser
+      where TUser : ZeroIdentityUser
     {
       IServiceCollection services = builder.Services;
 
diff --git a/zero.Web/ViewHelpers/ZeroMediaHelper.cs b/zero.Web/ViewHelpers/ZeroMediaHelper.cs
index 20aa4533..a61c8853 100644
--- a/zero.Web/ViewHelpers/ZeroMediaHelper.cs
+++ b/zero.Web/ViewHelpers/ZeroMediaHelper.cs
@@ -18,7 +18,7 @@ namespace zero.Web.ViewHelpers
     /// <summary>
     /// Media cache for repetitive queries within an HTTP request
     /// </summary>
-    Dictionary<string, IMedia> Cache { get; set; } = new Dictionary<string, IMedia>();
+    Dictionary<string, Media> Cache { get; set; } = new Dictionary<string, Media>();
 
 
     public ZeroMediaHelper(IHttpContextAccessor httpContextAccessor, IMediaApi mediaApi)
@@ -29,14 +29,14 @@ namespace zero.Web.ViewHelpers
 
 
     /// <inheritdoc />
-    public async Task<IMedia> GetById(string id)
+    public async Task<Media> GetById(string id)
     {
       if (id.IsNullOrEmpty())
       {
         return null;
       }
 
-      if (!Cache.TryGetValue(id, out IMedia media))
+      if (!Cache.TryGetValue(id, out Media media))
       {
         media = await MediaApi.GetById(id);
         Cache.Add(id, media);
@@ -47,14 +47,14 @@ namespace zero.Web.ViewHelpers
 
 
     /// <inheritdoc />
-    public async Task<Dictionary<string, IMedia>> GetByIds(string[] ids)
+    public async Task<Dictionary<string, Media>> GetByIds(string[] ids)
     {
       HashSet<string> remoteIds = new HashSet<string>();
-      Dictionary<string, IMedia> items = new Dictionary<string, IMedia>();
+      Dictionary<string, Media> items = new Dictionary<string, Media>();
 
       foreach (string id in ids)
       {
-        if (Cache.TryGetValue(id, out IMedia media))
+        if (Cache.TryGetValue(id, out Media media))
         {
           items.Add(id, media);
         }
@@ -66,7 +66,7 @@ namespace zero.Web.ViewHelpers
 
       if (remoteIds.Count > 0)
       {
-        Dictionary<string, IMedia> remoteItems = await MediaApi.GetById(remoteIds);
+        Dictionary<string, Media> remoteItems = await MediaApi.GetById(remoteIds);
 
         foreach (var item in remoteItems)
         {
@@ -82,7 +82,7 @@ namespace zero.Web.ViewHelpers
     /// <inheritdoc />
     public async Task<string> GetUrl(string id, bool isAbsolute = false)
     {
-      IMedia media = await GetById(id);
+      Media media = await GetById(id);
       return media?.Source.TrimStart("url://");
     }
 
@@ -90,7 +90,7 @@ namespace zero.Web.ViewHelpers
     /// <inheritdoc />
     public async Task<Dictionary<string, string>> GetUrls(string[] ids, bool isAbsolute = false)
     {
-      Dictionary<string, IMedia> medias = await GetByIds(ids);
+      Dictionary<string, Media> medias = await GetByIds(ids);
       return medias.ToDictionary(x => x.Key, x => x.Value?.Source.TrimStart("url://"));
     }
   }
@@ -101,12 +101,12 @@ namespace zero.Web.ViewHelpers
     /// <summary>
     /// Get media by Id
     /// </summary>
-    Task<IMedia> GetById(string id);
+    Task<Media> GetById(string id);
 
     /// <summary>
     /// Get media items by Ids
     /// </summary>
-    Task<Dictionary<string, IMedia>> GetByIds(string[] ids);
+    Task<Dictionary<string, Media>> GetByIds(string[] ids);
 
     /// <summary>
     /// Get source for a media item
diff --git a/zero.Web/ViewHelpers/ZeroPageHelper.cs b/zero.Web/ViewHelpers/ZeroPageHelper.cs
index 4be1fe83..45fe4f5f 100644
--- a/zero.Web/ViewHelpers/ZeroPageHelper.cs
+++ b/zero.Web/ViewHelpers/ZeroPageHelper.cs
@@ -18,7 +18,7 @@ namespace zero.Web.ViewHelpers
     /// <summary>
     /// Media cache for repetitive queries within an HTTP request
     /// </summary>
-    Dictionary<string, IMedia> Cache { get; set; } = new Dictionary<string, IMedia>();
+    Dictionary<string, Media> Cache { get; set; } = new Dictionary<string, Media>();
 
 
     public ZeroPageHelper(IHttpContextAccessor httpContextAccessor, IMediaApi mediaApi)
@@ -29,14 +29,14 @@ namespace zero.Web.ViewHelpers
 
 
     /// <inheritdoc />
-    public async Task<IMedia> GetById(string id)
+    public async Task<Media> GetById(string id)
     {
       if (id.IsNullOrEmpty())
       {
         return null;
       }
 
-      if (!Cache.TryGetValue(id, out IMedia media))
+      if (!Cache.TryGetValue(id, out Media media))
       {
         media = await MediaApi.GetById(id);
         Cache.Add(id, media);
@@ -47,14 +47,14 @@ namespace zero.Web.ViewHelpers
 
 
     /// <inheritdoc />
-    public async Task<Dictionary<string, IMedia>> GetByIds(string[] ids)
+    public async Task<Dictionary<string, Media>> GetByIds(string[] ids)
     {
       HashSet<string> remoteIds = new HashSet<string>();
-      Dictionary<string, IMedia> items = new Dictionary<string, IMedia>();
+      Dictionary<string, Media> items = new Dictionary<string, Media>();
 
       foreach (string id in ids)
       {
-        if (Cache.TryGetValue(id, out IMedia media))
+        if (Cache.TryGetValue(id, out Media media))
         {
           items.Add(id, media);
         }
@@ -66,7 +66,7 @@ namespace zero.Web.ViewHelpers
 
       if (remoteIds.Count > 0)
       {
-        Dictionary<string, IMedia> remoteItems = await MediaApi.GetById(remoteIds);
+        Dictionary<string, Media> remoteItems = await MediaApi.GetById(remoteIds);
 
         foreach (var item in remoteItems)
         {
@@ -82,7 +82,7 @@ namespace zero.Web.ViewHelpers
     /// <inheritdoc />
     public async Task<string> GetUrl(string id, bool isAbsolute = false)
     {
-      IMedia media = await GetById(id);
+      Media media = await GetById(id);
       return media?.Source;
     }
 
@@ -90,7 +90,7 @@ namespace zero.Web.ViewHelpers
     /// <inheritdoc />
     public async Task<Dictionary<string, string>> GetUrls(string[] ids, bool isAbsolute = false)
     {
-      Dictionary<string, IMedia> medias = await GetByIds(ids);
+      Dictionary<string, Media> medias = await GetByIds(ids);
       return medias.ToDictionary(x => x.Key, x => x.Value?.Source);
     }
   }
@@ -101,12 +101,12 @@ namespace zero.Web.ViewHelpers
     /// <summary>
     /// Get media by Id
     /// </summary>
-    Task<IMedia> GetById(string id);
+    Task<Media> GetById(string id);
 
     /// <summary>
     /// Get media items by Ids
     /// </summary>
-    Task<Dictionary<string, IMedia>> GetByIds(string[] ids);
+    Task<Dictionary<string, Media>> GetByIds(string[] ids);
 
     /// <summary>
     /// Get source for a media item
diff --git a/zero.Web/Views/index.tpl.html b/zero.Web/Views/index.tpl.html
new file mode 100644
index 00000000..8698a332
--- /dev/null
+++ b/zero.Web/Views/index.tpl.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="robots" content="noindex,nofollow">
+  <meta name="author" content="brothers">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta http-equiv="content-type" content="text/html; charset=utf-8">
+  <meta http-equiv="expires" content="0">
+  <link rel="icon" type="image/png" href="/assets/zero-icon.png" sizes="32x32">
+  <link rel="image_src" type="image/png" href="/assets/zero-icon.png" sizes="192x192" />
+  <link rel="shortcut icon" type="image/png" href="/assets/zero-icon.png" sizes="196x196">
+  <base href="~/">
+  {{styles}}
+  <title>zero</title>
+</head>
+<body class="theme-light theme-roundedx">
+  <div id="app"></div>
+  <svg xmlns="http://www.w3.org/2000/svg" style="display: none;">{{svg}}</svg>
+  <script id="zeroconfig" type="application/json">{{config}}</script>
+  <script>
+    window.__zero = {{config}};
+    window.zero = window.__zero;
+  </script>
+  {{scripts}}
+</body>
+</html>
\ No newline at end of file
diff --git a/zero.Web/ZeroVue.cs b/zero.Web/ZeroVue.cs
index 9e8fe9f2..fd9be8d9 100644
--- a/zero.Web/ZeroVue.cs
+++ b/zero.Web/ZeroVue.cs
@@ -136,7 +136,7 @@ namespace zero.Web
           continue;
         }
 
-        bool isExternal = !(section is IZeroInternal);
+        bool isExternal = !(section is IInternalSection);
         string url = Safenames.Alias(section.Alias).EnsureStartsWith('/');
 
         if (section.Alias == Constants.Sections.Dashboard)
@@ -236,7 +236,7 @@ namespace zero.Web
             continue;
           }
 
-          bool isPlugin = !(area is IZeroInternal);
+          bool isPlugin = !(area is InternalSettingsArea);
 
           ZeroVueSettingsArea vueArea = new ZeroVueSettingsArea()
           {
@@ -270,7 +270,7 @@ namespace zero.Web
     /// </summary>
     async Task<List<ZeroVueApplication>> CreateApplications()
     {
-      IList<IApplication> applications = await ApplicationsApi.GetAll();
+      IList<Application> applications = await ApplicationsApi.GetAll();
 
       return applications.OrderBy(app => app.Sort).Select(app => new ZeroVueApplication()
       {
@@ -329,11 +329,11 @@ namespace zero.Web
     IList<ZeroVueIconSet> CreateIconSets()
     {
       List<ZeroVueIconSet> result = new();
-      IReadOnlyCollection<IIconSet> sets = Options.Icons.GetAllItems();
+      IReadOnlyCollection<IconSet> sets = Options.Icons.GetAllItems();
 
       StringBuilder svg = new();
 
-      foreach (IIconSet set in sets)
+      foreach (IconSet set in sets)
       {
         string path = Paths.Map(set.SpritePath.TrimStart('/'));