diff --git a/zero.Core/Api/CountriesApi.cs b/zero.Core/Api/CountriesApi.cs
index a84d4da6..eb3b8de0 100644
--- a/zero.Core/Api/CountriesApi.cs
+++ b/zero.Core/Api/CountriesApi.cs
@@ -62,56 +62,14 @@ namespace zero.Core.Api
     /// <inheritdoc />
     public async Task<EntityResult<T>> Save(T model)
     {
-      ValidationResult validation = await Validator.ValidateAsync(model);
-
-      if (!validation.IsValid)
-      {
-        return EntityResult<T>.Fail(validation);
-      }
-
-      if (model.Id.IsNullOrEmpty())
-      {
-        model.CreatedDate = DateTimeOffset.Now;
-      }
-
-      model.Alias = Alias.Generate(model.Name);
-
-      using (IAsyncDocumentSession session = Raven.OpenAsyncSession())
-      {
-        await session.StoreAsync(model);
-
-        string id = session.Advanced.GetDocumentId(model);
-
-        await session.SaveChangesAsync();
-
-        if (model.Id.IsNullOrEmpty())
-        {
-          model.Id = id;
-        }
-      }
-
-      return EntityResult<T>.Success(model);
+      return await Save(model, Validator);
     }
 
 
     /// <inheritdoc />
     public async Task<EntityResult<T>> Delete(string id)
     {
-      using (IAsyncDocumentSession session = Raven.OpenAsyncSession())
-      {
-        T country = await session.LoadAsync<T>(id);
-
-        if (country == null)
-        {
-          return EntityResult<T>.Fail("@errors.ondelete.idnotfound");
-        }
-
-        session.Delete(country);
-
-        await session.SaveChangesAsync();
-      }
-
-      return EntityResult<T>.Success();
+      return await DeleteById<T>(id);
     }
   }
 
diff --git a/zero.Core/Api/LanguagesApi.cs b/zero.Core/Api/LanguagesApi.cs
index dfce8567..e8c04bc6 100644
--- a/zero.Core/Api/LanguagesApi.cs
+++ b/zero.Core/Api/LanguagesApi.cs
@@ -1,4 +1,4 @@
-using FluentValidation.Results;
+using FluentValidation;
 using Raven.Client.Documents;
 using Raven.Client.Documents.Linq;
 using Raven.Client.Documents.Session;
@@ -9,31 +9,33 @@ using System.Linq;
 using System.Threading.Tasks;
 using zero.Core.Entities;
 using zero.Core.Extensions;
-using zero.Core.Validation;
 
 namespace zero.Core.Api
 {
-  public class LanguagesApi : BackofficeApi, ILanguagesApi
+  public class LanguagesApi<T> : BackofficeApi, ILanguagesApi<T> where T : ILanguage
   {
-    public LanguagesApi(IBackofficeStore store) : base(store) { }
+    IValidator<T> Validator;
 
 
-    /// <inheritdoc />
-    public async Task<Language> GetById(string id)
+    public LanguagesApi(IBackofficeStore store, IValidator<T> validator) : base(store)
     {
-      using (IAsyncDocumentSession session = Raven.OpenAsyncSession())
-      {
-        return await session.LoadAsync<Language>(id);
-      }
+      Validator = validator;
     }
 
 
     /// <inheritdoc />
-    public async Task<IList<Language>> GetAll()
+    public async Task<T> GetById(string id)
+    {
+      return await GetById<T>(id);
+    }
+
+
+    /// <inheritdoc />
+    public async Task<IList<T>> GetAll()
     {
       using (IAsyncDocumentSession session = Raven.OpenAsyncSession())
       {
-        return await session.Query<Language>()
+        return await session.Query<T>()
           .OrderByDescending(x => x.CreatedDate)
           .ToListAsync();
       }
@@ -58,78 +60,44 @@ namespace zero.Core.Api
 
 
     /// <inheritdoc />
-    public async Task<ListResult<Language>> GetByQuery(ListQuery<Language> query)
+    public async Task<ListResult<T>> GetByQuery(ListQuery<T> query)
     {
       query.SearchFor(entity => entity.Name);
 
       using (IAsyncDocumentSession session = Raven.OpenAsyncSession())
       {
-        return await session.Query<Language>()
+        return await session.Query<T>()
           .ToQueriedListAsync(query);
       }
     }
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<Language>> Save(Language model)
+    public async Task<EntityResult<T>> Save(T model)
     {
-      ValidationResult validation = await new LanguageValidator().ValidateAsync(model);
-
-      if (!validation.IsValid)
-      {
-        return EntityResult<Language>.Fail(validation);
-      }
-
-      if (model.Id.IsNullOrEmpty())
-      {
-        model.CreatedDate = DateTimeOffset.Now;
-      }
-
-      model.Alias = Alias.Generate(model.Name);
-
-      using (IAsyncDocumentSession session = Raven.OpenAsyncSession())
-      {
-        await session.StoreAsync(model);
-        await session.SaveChangesAsync();
-      }
-
-      return EntityResult<Language>.Success(model);
+      return await Save(model, Validator);
     }
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<Language>> Delete(string id)
+    public async Task<EntityResult<T>> Delete(string id)
     {
-      using (IAsyncDocumentSession session = Raven.OpenAsyncSession())
-      {
-        Language entity = await session.LoadAsync<Language>(id);
-
-        if (entity == null)
-        {
-          return EntityResult<Language>.Fail("@errors.ondelete.idnotfound");
-        }
-
-        session.Delete(entity);
-
-        await session.SaveChangesAsync();
-      }
-
-      return EntityResult<Language>.Success();
+      return await DeleteById<T>(id);
     }
   }
 
 
-  public interface ILanguagesApi
+  public interface ILanguagesApi<T> where T : ILanguage
   {
     /// <summary>
     /// Get language by Id
     /// </summary>
-    Task<Language> GetById(string id);
+    Task<T> GetById(string id);
 
     /// <summary>
     /// Get all available languages
     /// </summary>
-    Task<IList<Language>> GetAll();
+    Task<IList<T>> GetAll();
 
     /// <summary>
     /// Get all available cultures
@@ -139,16 +107,16 @@ namespace zero.Core.Api
     /// <summary>
     /// Get all available languages (with query)
     /// </summary>
-    Task<ListResult<Language>> GetByQuery(ListQuery<Language> query);
+    Task<ListResult<T>> GetByQuery(ListQuery<T> query);
 
     /// <summary>
     /// Creates or updates a language
     /// </summary>
-    Task<EntityResult<Language>> Save(Language model);
+    Task<EntityResult<T>> Save(T model);
 
     /// <summary>
     /// Deletes a language by Id
     /// </summary>
-    Task<EntityResult<Language>> Delete(string id);
+    Task<EntityResult<T>> Delete(string id);
   }
 }
diff --git a/zero.Core/Entities/Country.cs b/zero.Core/Entities/Country.cs
index f63e434b..e0974a77 100644
--- a/zero.Core/Entities/Country.cs
+++ b/zero.Core/Entities/Country.cs
@@ -18,11 +18,11 @@
     /// <summary>
     /// Preferred countries are displayed on top in lists
     /// </summary>
-    public bool IsPreferred { get; set; }
+    bool IsPreferred { get; set; }
 
     /// <summary>
     /// Country code (ISO 3166-1)
     /// </summary>
-    public string Code { get; set; }
+    string Code { get; set; }
   }
 }
diff --git a/zero.Core/Entities/Language.cs b/zero.Core/Entities/Language.cs
index b68e209e..f679262d 100644
--- a/zero.Core/Entities/Language.cs
+++ b/zero.Core/Entities/Language.cs
@@ -1,20 +1,33 @@
 namespace zero.Core.Entities
 {
-  public class Language : ZeroEntity, IZeroDbConventions
+  public class Language : ZeroEntity, ILanguage
+  {
+    /// <inheritdoc />
+    public string Code { get; set; }
+
+    /// <inheritdoc />
+    public bool IsDefault { get; set; }
+
+    /// <inheritdoc />
+    public string InheritedLanguageId { get; set; }
+  }
+
+
+  public interface ILanguage : IZeroEntity, IZeroDbConventions
   {
     /// <summary>
     /// Language code (ISO 3166-1)
     /// </summary>
-    public string Code { get; set; }
+    string Code { get; set; }
 
     /// <summary>
     /// Whether this is the default language
     /// </summary>
-    public bool IsDefault { get; set; }
+    bool IsDefault { get; set; }
 
     /// <summary>
     /// If this language is inherited it gets all missing properties from its parent
     /// </summary>
-    public string InheritedLanguageId { get; set; }
+    string InheritedLanguageId { get; set; }
   }
 }
\ No newline at end of file
diff --git a/zero.Core/ServiceCollectionExtensions.cs b/zero.Core/ServiceCollectionExtensions.cs
index 431a8efb..caa8cee1 100644
--- a/zero.Core/ServiceCollectionExtensions.cs
+++ b/zero.Core/ServiceCollectionExtensions.cs
@@ -1,6 +1,5 @@
 using FluentValidation;
 using Microsoft.Extensions.DependencyInjection;
-using Scrutor;
 using System;
 using System.Linq;
 using System.Reflection;
@@ -19,6 +18,9 @@ namespace zero.Core.Entities
 
       services.AddTransient<ICountry, Country>();
       services.AddTransient(typeof(ICountriesApi<>), typeof(CountriesApi<>));
+
+      services.AddTransient<ILanguage, Language>();
+      services.AddTransient(typeof(ILanguagesApi<>), typeof(LanguagesApi<>));
     }
 
 
diff --git a/zero.Web.UI/App/pages/settings/language.vue b/zero.Web.UI/App/pages/settings/language.vue
index fe792864..64bdeac8 100644
--- a/zero.Web.UI/App/pages/settings/language.vue
+++ b/zero.Web.UI/App/pages/settings/language.vue
@@ -80,7 +80,7 @@
         form.load(LanguagesApi.getById(this.id)).then(response =>
         {
           this.disabled = !response.canEdit;
-          this.model = response;
+          this.model = response.entity;
         });
 
         LanguagesApi.getAllCultures().then(res =>
diff --git a/zero.Web/Controllers/LanguagesController.cs b/zero.Web/Controllers/LanguagesController.cs
index 705faa91..384dbf9d 100644
--- a/zero.Web/Controllers/LanguagesController.cs
+++ b/zero.Web/Controllers/LanguagesController.cs
@@ -8,12 +8,12 @@ using zero.Web.Models;
 namespace zero.Web.Controllers
 {
   [ZeroAuthorize(Permissions.Settings.Languages, PermissionsValue.Read)]
-  public class LanguagesController : BackofficeController
+  public class LanguagesController<T> : BackofficeController where T : ILanguage, new()
   {
-    ILanguagesApi Api;
+    ILanguagesApi<T> Api;
 
 
-    public LanguagesController(ILanguagesApi api)
+    public LanguagesController(ILanguagesApi<T> api)
     {
       Api = api;
     }
@@ -22,57 +22,38 @@ namespace zero.Web.Controllers
     /// <summary>
     /// Get translation by id
     /// </summary>  
-    public IActionResult GetEmpty()
-    {
-      return Json(new LanguageEditModel());
-    }
+    public IActionResult GetEmpty() => Json(new T());
 
 
     /// <summary>
     /// Get translation by id
     /// </summary>  
-    public async Task<IActionResult> GetById([FromQuery] string id)
-    {
-      return await As<Language, LanguageEditModel>(await Api.GetById(id));
-    }
+    public async Task<IActionResult> GetById([FromQuery] string id) => JsonEdit(await Api.GetById(id));
 
 
     /// <summary>
     /// Get all translations
     /// </summary>    
-    public async Task<IActionResult> GetAll([FromQuery] ListQuery<Language> query)
-    {
-      return await As<Language, LanguageListModel>(await Api.GetByQuery(query));
-    }
+    public async Task<IActionResult> GetAll([FromQuery] ListQuery<T> query) => Json(await Api.GetByQuery(query));
 
 
     /// <summary>
     /// Returns all cultures available for creating languages.
     /// </summary>
-    public IActionResult GetAllCultures()
-    {
-      return Json(Api.GetAllCultures());
-    }
+    public IActionResult GetAllCultures() => Json(Api.GetAllCultures());
 
 
     /// <summary>
     /// Save translation
     /// </summary>
     [ZeroAuthorize(Permissions.Settings.Languages, PermissionsValue.Write)]
-    public async Task<IActionResult> Save([FromBody] LanguageEditModel model)
-    {
-      Language entity = await Mapper.Map(model, await Api.GetById(model.Id));
-      return await As<Language, LanguageEditModel>(await Api.Save(entity));
-    }
+    public async Task<IActionResult> Save([FromBody] T model) => Json(await Api.Save(model));
 
 
     /// <summary>
     /// Deletes a translation
     /// </summary>
     [ZeroAuthorize(Permissions.Settings.Languages, PermissionsValue.Write)]
-    public async Task<IActionResult> Delete([FromQuery] string id)
-    {
-      return await As<Language, LanguageEditModel>(await Api.Delete(id));
-    }
+    public async Task<IActionResult> Delete([FromQuery] string id) => Json(await Api.Delete(id));
   }
 }
diff --git a/zero.Web/Controllers/TestController.cs b/zero.Web/Controllers/TestController.cs
deleted file mode 100644
index 85837ada..00000000
--- a/zero.Web/Controllers/TestController.cs
+++ /dev/null
@@ -1,162 +0,0 @@
-using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Options;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using zero.Core;
-using zero.Core.Api;
-using zero.Core.Entities;
-using zero.Core.Identity;
-using zero.Core.Options;
-using zero.Core.Plugins;
-using zero.Core.Renderer;
-
-namespace zero.Web.Controllers
-{
-  //[ZeroAuthorize("tobi")]
-  public class TestController : BackofficeController
-  {
-    IAuthenticationApi Api;
-    ISpacesApi SpacesApi;
-    ILanguagesApi LanguagesApi;
-    SignInManager<User> SignInManager;
-
-
-    public TestController(IAuthenticationApi api, ISpacesApi spacesApi, ILanguagesApi languagesApi, SignInManager<User> signInManager)
-    {
-      Api = api;
-      SpacesApi = spacesApi;
-      LanguagesApi = languagesApi;
-      SignInManager = signInManager;
-    }
-
-
-    [HttpGet]
-    [ZeroAuthorize(false)]
-    public IActionResult GetPlugins([FromServices] IEnumerable<IZeroPlugin> plugins)
-    {
-      return Json(plugins);
-    }
-
-
-    //[HttpGet]
-    //[ZeroAuthorize(false)]
-    //public IActionResult RenderConfig()
-    //{
-    //  SocialContentRenderer renderer = new SocialContentRenderer();
-
-    //  return Json(renderer.Build());
-    //}
-
-
-    //[HttpGet]
-    //[ZeroAuthorize(false)]
-    //public async Task<IActionResult> SaveSpaceContent()
-    //{
-    //  TeamMember model = new TeamMember()
-    //  {
-    //    IsActive = true,
-    //    Email = "tobi@test.com",
-    //    Name = "Tobi",
-    //    Position = "Chef",
-    //    VideoUri = "https://swcs.pro"
-    //  };
-
-    //  model.Addresses.Add(new TeamMemberAddress()
-    //  {
-    //    City = "Braunau",
-    //    Street = "My street",
-    //    No = "23"
-    //  });
-
-    //  return Json(await SpacesApi.Save("team", model));
-    //}
-
-
-    [HttpGet]
-    [ZeroAuthorize(false)]
-    public async Task<IActionResult> AddLanguage()
-    {
-      return Json(await LanguagesApi.Save(new Language()
-      {
-
-        IsActive = true,
-        Name = "English",
-        Code = "en-US",
-        IsDefault = true
-      }));
-    }
-
-
-    //[HttpGet]
-    //[ZeroAuthorize(false)]
-    //public async Task<IActionResult> GetSpaceList()
-    //{
-    //  return Json(await SpacesApi.GetList<TeamMember>("team"));
-    //}
-
-
-    [HttpGet]
-    [ZeroAuthorize(false)]
-    public IActionResult GetRenderer([FromQuery] string alias)
-    {
-      Space space = SpacesApi.GetByAlias(alias);
-
-      AbstractGenericRenderer renderer = Options.Renderers.GetAllItems().FirstOrDefault(x => x.TargetType == space.Type);
-
-      if (renderer == null)
-      {
-        return NotFound();
-      }
-
-      return Json(renderer.Build());
-    }
-
-
-    [HttpPost]
-    public async Task<IActionResult> Login([FromQuery] string username, [FromQuery] string password)
-    {
-      Microsoft.AspNetCore.Identity.SignInResult result = await SignInManager.PasswordSignInAsync(username, password, false, true);
-
-      return Json(new 
-      {
-        username,
-        password,
-        result
-      });
-    }
-
-
-    [ZeroAuthorize]
-    public async Task<IActionResult> GetUser()
-    {
-      User user = await SignInManager.UserManager.GetUserAsync(HttpContext.User);
-
-      return Json(new
-      {
-        user
-      });
-    }
-
-
-    [ZeroAuthorize]
-    public IActionResult GetUserClaims()
-    {
-      return Json(HttpContext.User.Claims.Select(claim => new { claim.Type, claim.Value }).ToArray());
-    }
-
-
-    [HttpPost]
-    public async Task<IActionResult> Logout()
-    {
-      await SignInManager.SignOutAsync();
-
-      return Json(new
-      {
-        success = true
-      });
-    }
-  }
-}
diff --git a/zero.Web/Controllers/UsersController.cs b/zero.Web/Controllers/UsersController.cs
index a8e2a64b..cc910b98 100644
--- a/zero.Web/Controllers/UsersController.cs
+++ b/zero.Web/Controllers/UsersController.cs
@@ -8,16 +8,16 @@ using zero.Web.Models;
 namespace zero.Web.Controllers
 {
   [ZeroAuthorize(Permissions.Settings.Users, PermissionsValue.Read)]
-  public class UsersController : BackofficeController
+  public class UsersController<TLanguage> : BackofficeController where TLanguage : ILanguage
   {
     IUserApi Api;
     IAuthenticationApi AuthenticationApi;
     IUserRolesApi RolesApi;
-    ILanguagesApi LanguagesApi;
+    ILanguagesApi<TLanguage> LanguagesApi;
     IPermissionsApi PermissionsApi;
 
 
-    public UsersController(IUserApi api, IAuthenticationApi authenticationApi, IUserRolesApi rolesApi, ILanguagesApi languagesApi, IPermissionsApi permissionsApi)
+    public UsersController(IUserApi api, IAuthenticationApi authenticationApi, IUserRolesApi rolesApi, ILanguagesApi<TLanguage> languagesApi, IPermissionsApi permissionsApi)
     {
       Api = api;
       AuthenticationApi = authenticationApi;
diff --git a/zero.Web/Defaults/DefaultBackofficePlugin.cs b/zero.Web/Defaults/DefaultBackofficePlugin.cs
index 0ca99e25..f611d9ff 100644
--- a/zero.Web/Defaults/DefaultBackofficePlugin.cs
+++ b/zero.Web/Defaults/DefaultBackofficePlugin.cs
@@ -14,6 +14,7 @@ namespace zero.Web.Defaults
     {
       EntityMap.Use<IApplication, Application>();
       EntityMap.Use<ICountry, Country>();
+      EntityMap.Use<ILanguage, Language>();
     }
     
     public void Configure(IZeroPluginOptions plugin, IZeroOptions zero)
diff --git a/zero.Web/ZeroBuilder.cs b/zero.Web/ZeroBuilder.cs
index ce9d3153..277b7d53 100644
--- a/zero.Web/ZeroBuilder.cs
+++ b/zero.Web/ZeroBuilder.cs
@@ -105,7 +105,6 @@ namespace zero.Web
       Services.AddTransient<IToken, Token>();
       Services.AddTransient<ISpacesApi, SpacesApi>();
       Services.AddTransient<ITranslationsApi, TranslationsApi>();
-      Services.AddTransient<ILanguagesApi, LanguagesApi>();
       Services.AddTransient<IPermissionsApi, PermissionsApi>();
       Services.AddTransient<IMediaApi, MediaApi>();
       Services.AddTransient<IMediaFolderApi, MediaFolderApi>();