diff --git a/zero.Web/App/Components/permissions.vue b/zero.Web/App/Components/permissions.vue
index 1200534f..a9d2b175 100644
--- a/zero.Web/App/Components/permissions.vue
+++ b/zero.Web/App/Components/permissions.vue
@@ -93,9 +93,9 @@
           collection.items.forEach(permission =>
           {
             if (
-              (permission.valueType === 'boolean' && permission.value === true) ||
-              (permission.valueType === 'readWrite' && permission.value !== 'none') ||
-              (permission.valueType === 'string' && !!permission.value))
+              (permission.valueType === 'boolean') ||
+              (permission.valueType === 'readWrite') ||
+              (permission.valueType === 'string'))
             {
               claims.push({
                 //$type: 'zero.Core.Entities.UserClaim, zero.Core',
diff --git a/zero.Web/App/pages/settings/users.vue b/zero.Web/App/pages/settings/users.vue
index 3e61018e..bb97d2fe 100644
--- a/zero.Web/App/pages/settings/users.vue
+++ b/zero.Web/App/pages/settings/users.vue
@@ -29,6 +29,7 @@
   import AuthApi from 'zero/services/auth.js'
   import UserRolesApi from 'zero/resources/userRoles.js';
   import UsersApi from 'zero/resources/users.js';
+  import { filter as _filter, map as _map } from 'underscore';
 
   export default {
     data: () => ({
@@ -38,7 +39,10 @@
 
     created()
     {
-      this._user = AuthApi.user;
+      UserRolesApi.getAll().then(items =>
+      {
+        this.roles = items;
+      });
 
       this.usersConfig = {
         labelPrefix: '@user.fields.',
@@ -58,7 +62,14 @@
             link: this.getUserLink
           },
           email: 'text',
-          roles: 'text',
+          roles: {
+            as: 'text',
+            render: item =>
+            {
+              const roles = _filter(this.roles, role => item.roles.indexOf(role.alias) > -1);
+              return _map(roles, role => role.name).join(', ');
+            }
+          },
           isActive: {
             as: 'bool',
             width: 200
@@ -66,11 +77,6 @@
         },
         items: UsersApi.getAll
       };
-
-      UserRolesApi.getAll().then(items =>
-      {
-        this.roles = items;
-      });
     },
 
     methods: {
diff --git a/zero.Web/Controllers/BackofficeController.cs b/zero.Web/Controllers/BackofficeController.cs
index 08cefe34..39d3b8db 100644
--- a/zero.Web/Controllers/BackofficeController.cs
+++ b/zero.Web/Controllers/BackofficeController.cs
@@ -35,7 +35,7 @@ namespace zero.Web.Controllers
     }
 
 
-    protected IActionResult As<T, TTarget>(T model) where TTarget : class, new() where T : IZeroEntity
+    protected async Task<IActionResult> As<T, TTarget>(T model) where TTarget : class, new() where T : IZeroEntity
     {
       if (model == null)
       {
@@ -47,7 +47,7 @@ namespace zero.Web.Controllers
         // TODO show error with help on how to inject mapper in constructor + base constructor
       }
 
-      TTarget result = Mapper.Map<T, TTarget>(model);
+      TTarget result = await Mapper.Map<T, TTarget>(model);
 
       if (result is EditModel)
       {
@@ -59,40 +59,40 @@ namespace zero.Web.Controllers
     }
 
 
-    protected IActionResult As<T, TTarget>(IEnumerable<T> model) where TTarget : class, new() where T : IZeroEntity
+    protected async Task<IActionResult> As<T, TTarget>(IEnumerable<T> model) where TTarget : class, new() where T : IZeroEntity
     {
       if (model == null)
       {
         return new StatusCodeResult(404);
       }
 
-      return Json(Mapper.Map<T, TTarget>(model));
+      return Json(await Mapper.Map<T, TTarget>(model));
     }
 
 
-    protected IActionResult As<T, TTarget>(ListResult<T> model) where TTarget : class, new() where T : IZeroEntity
+    protected async Task<IActionResult> As<T, TTarget>(ListResult<T> model) where TTarget : class, new() where T : IZeroEntity
     {
       if (model == null)
       {
         return new StatusCodeResult(404);
       }
 
-      return Json(Mapper.Map<T, TTarget>(model));
+      return Json(await Mapper.Map<T, TTarget>(model));
     }
 
-    protected IActionResult As<T, TTarget>(EntityResult<T> model) where TTarget : class, new() where T : IZeroEntity
+    protected async Task<IActionResult> As<T, TTarget>(EntityResult<T> model) where TTarget : class, new() where T : IZeroEntity
     {
       if (model == null)
       {
         return new StatusCodeResult(404);
       }
 
-      return Json(Mapper.Map<T, TTarget>(model));
+      return Json(await Mapper.Map<T, TTarget>(model));
     }
 
-    protected TTarget Map<T, TTarget>(T model) where TTarget : class, new()
+    protected async Task<TTarget> Map<T, TTarget>(T model) where TTarget : class, new()
     {
-      return Mapper.Map<T, TTarget>(model);
+      return await Mapper.Map<T, TTarget>(model);
     }
   }
 }
diff --git a/zero.Web/Controllers/CountriesController.cs b/zero.Web/Controllers/CountriesController.cs
index 782182c3..b6ba55e6 100644
--- a/zero.Web/Controllers/CountriesController.cs
+++ b/zero.Web/Controllers/CountriesController.cs
@@ -25,7 +25,7 @@ namespace zero.Web.Controllers
     /// </summary>
     public async Task<IActionResult> GetById([FromQuery] string id)
     {
-      return As<Country, CountryEditModel>(await Api.GetById(id));
+      return await As<Country, CountryEditModel>(await Api.GetById(id));
     }
 
 
@@ -34,7 +34,7 @@ namespace zero.Web.Controllers
     /// </summary>    
     public async Task<IActionResult> GetAll([FromQuery] ListQuery<Country> query)
     {
-      return As<Country, CountryListModel>(await Api.GetByQuery("en-US", query));
+      return await As<Country, CountryListModel>(await Api.GetByQuery("en-US", query));
     }
 
 
@@ -44,7 +44,7 @@ namespace zero.Web.Controllers
     [ZeroAuthorize(Permissions.Settings.Countries, PermissionsValue.Write)]
     public async Task<IActionResult> Save([FromBody] CountryEditModel model)
     {
-      Country country = Mapper.Map(model, await Api.GetById(model.Id));
+      Country country = await Mapper.Map(model, await Api.GetById(model.Id));
       return Json(await Api.Save(country));
     }
 
diff --git a/zero.Web/Controllers/UserRolesController.cs b/zero.Web/Controllers/UserRolesController.cs
index 228b0c2b..41729309 100644
--- a/zero.Web/Controllers/UserRolesController.cs
+++ b/zero.Web/Controllers/UserRolesController.cs
@@ -31,7 +31,7 @@ namespace zero.Web.Controllers
     /// </summary>  
     public async Task<IActionResult> GetById([FromQuery] string id)
     {
-      return As<UserRole, UserRoleEditModel>(await Api.GetById(id));
+      return await As<UserRole, UserRoleEditModel>(await Api.GetById(id));
     }
 
 
@@ -40,7 +40,7 @@ namespace zero.Web.Controllers
     /// </summary>    
     public async Task<IActionResult> GetAll()
     {
-      return As<UserRole, UserRoleListModel>(await Api.GetAll());
+      return await As<UserRole, UserRoleListModel>(await Api.GetAll());
     }
 
 
@@ -60,8 +60,8 @@ namespace zero.Web.Controllers
     public async Task<IActionResult> Save([FromBody] UserRoleEditModel model)
     {
       var state = ModelState;
-      UserRole role = Mapper.Map(model, await Api.GetById(model.Id));
-      return As<UserRole, UserRoleEditModel>(await Api.Save(role));
+      UserRole role = await Mapper.Map(model, await Api.GetById(model.Id));
+      return await As<UserRole, UserRoleEditModel>(await Api.Save(role));
     }
 
 
@@ -71,7 +71,7 @@ namespace zero.Web.Controllers
     [ZeroAuthorize(Permissions.Settings.Users, PermissionsValue.Write)]
     public async Task<IActionResult> Delete([FromQuery] string id)
     {
-      return As<UserRole, UserRoleEditModel>(await Api.Delete(id));
+      return await As<UserRole, UserRoleEditModel>(await Api.Delete(id));
     }
   }
 }
diff --git a/zero.Web/Controllers/UsersController.cs b/zero.Web/Controllers/UsersController.cs
index 995323cd..8ca4d59b 100644
--- a/zero.Web/Controllers/UsersController.cs
+++ b/zero.Web/Controllers/UsersController.cs
@@ -13,13 +13,17 @@ namespace zero.Web.Controllers
   [ZeroAuthorize(Permissions.Settings.Users, PermissionsValue.Read)]
   public class UsersController : BackofficeController
   {
-    private IUserApi Api { get; set; }
+    IUserApi Api = null;
 
-    private ZeroOptions Options { get; set; }
+    IUserRolesApi RolesApi = null;
 
-    public UsersController(IZeroConfiguration config, IUserApi api, IMapper mapper, IToken token, IOptionsMonitor<ZeroOptions> options) : base(config, mapper, token)
+    ZeroOptions Options = null;
+
+
+    public UsersController(IZeroConfiguration config, IUserApi api, IUserRolesApi rolesApi, IMapper mapper, IToken token, IOptionsMonitor<ZeroOptions> options) : base(config, mapper, token)
     {
       Api = api;
+      RolesApi = rolesApi;
       Options = options.CurrentValue;
     }
 
@@ -29,7 +33,7 @@ namespace zero.Web.Controllers
     /// </summary>    
     public async Task<IActionResult> GetById([FromQuery] string id)
     {
-      return As<User, UserEditModel>(await Api.GetUserById(id));
+      return await As<User, UserEditModel>(await Api.GetUserById(id));
     }
 
 
@@ -38,7 +42,7 @@ namespace zero.Web.Controllers
     /// </summary>    
     public async Task<IActionResult> GetAll([FromQuery] ListQuery<User> query)
     {
-      return As<User, UserListModel>(await Api.GetByQuery(query, "zero.applications.1-A"));
+      return await As<User, UserListModel>(await Api.GetByQuery(query, "zero.applications.1-A"));
     }
 
 
diff --git a/zero.Web/Mapper/CountryMapperConfig.cs b/zero.Web/Mapper/CountryMapperConfig.cs
index 2ddf6760..7fb7d1b4 100644
--- a/zero.Web/Mapper/CountryMapperConfig.cs
+++ b/zero.Web/Mapper/CountryMapperConfig.cs
@@ -1,4 +1,5 @@
-using zero.Core.Entities;
+using Raven.Client.Documents;
+using zero.Core.Entities;
 using zero.Web.Models;
 
 namespace zero.Web.Mapper
diff --git a/zero.Web/Mapper/DefaultMapper.cs b/zero.Web/Mapper/DefaultMapper.cs
index 821ddc5c..89576199 100644
--- a/zero.Web/Mapper/DefaultMapper.cs
+++ b/zero.Web/Mapper/DefaultMapper.cs
@@ -1,7 +1,10 @@
-using System;
+using Raven.Client.Documents;
+using Raven.Client.Documents.Session;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using System.Threading.Tasks;
 using zero.Core.Entities;
 
 namespace zero.Web.Mapper
@@ -10,6 +13,14 @@ namespace zero.Web.Mapper
   {
     MapCache Maps = new MapCache();
 
+    IDocumentStore Raven = null;
+
+
+    public DefaultMapper(IDocumentStore raven)
+    {
+      Raven = raven;
+    }
+
 
     /// <inheritdoc />
     public void Add<T>() where T : IMapperConfig, new()
@@ -34,39 +45,39 @@ namespace zero.Web.Mapper
 
 
     /// <inheritdoc />
-    public TTarget Map<TSource, TTarget>(TSource source) where TTarget : class, new()
+    public async Task<TTarget> Map<TSource, TTarget>(TSource source) where TTarget : class, new()
     {
       if (source == null)
       {
         return null;
       }
 
-      return Map(source, new TTarget());
+      return await Map(source, new TTarget());
     }
 
 
     /// <inheritdoc />
-    public TTarget Map<TSource, TTarget>(TSource source, TTarget target) where TTarget : class, new()
+    public async Task<TTarget> Map<TSource, TTarget>(TSource source, TTarget target) where TTarget : class, new()
     {
       if (source == null)
       {
         return target;
       }
 
-      Maps.Call(source, target);
+      await Maps.Call(source, target);
 
       return target;
     }
 
 
     /// <inheritdoc />
-    public IEnumerable<TTarget> Map<TSource, TTarget>(IEnumerable<TSource> source) where TTarget : class, new()
+    public async Task<IEnumerable<TTarget>> Map<TSource, TTarget>(IEnumerable<TSource> source) where TTarget : class, new()
     {
       IList<TTarget> target = new List<TTarget>();
 
       foreach (TSource item in source)
       {
-        target.Add(Map(item, new TTarget()));
+        target.Add(await Map(item, new TTarget()));
       }
 
       return target;
@@ -74,13 +85,13 @@ namespace zero.Web.Mapper
 
 
     /// <inheritdoc />
-    public ListResult<TTarget> Map<TSource, TTarget>(ListResult<TSource> source) where TTarget : class, new()
+    public async Task<ListResult<TTarget>> Map<TSource, TTarget>(ListResult<TSource> source) where TTarget : class, new()
     {
       IList<TTarget> target = new List<TTarget>();
 
       foreach (TSource item in source.Items)
       {
-        target.Add(Map(item, new TTarget()));
+        target.Add(await Map(item, new TTarget()));
       }
 
       return new ListResult<TTarget>(target, source.TotalItems, source.Page, source.PageSize)
@@ -91,13 +102,13 @@ namespace zero.Web.Mapper
 
 
     /// <inheritdoc />
-    public EntityResult<TTarget> Map<TSource, TTarget>(EntityResult<TSource> source) where TTarget : class, new()
+    public async Task<EntityResult<TTarget>> Map<TSource, TTarget>(EntityResult<TSource> source) where TTarget : class, new()
     {
       return new EntityResult<TTarget>()
       {
         IsSuccess = source.IsSuccess,
         Errors = source.Errors,
-        Model = Map(source.Model, new TTarget())
+        Model = await Map(source.Model, new TTarget())
       };
     }
 
@@ -105,14 +116,28 @@ namespace zero.Web.Mapper
     /// <inheritdoc />
     public void CreateMap<TSource, TTarget>(Action<TSource, TTarget> map) where TTarget : class, new()
     {
-      Maps.Add<TSource, TTarget>((source, target) =>  map((TSource)source, (TTarget)target));
+      Maps.Add<TSource, TTarget>((source, target) =>
+      {
+        map((TSource)source, (TTarget)target);
+        return Task.CompletedTask;
+      });
+    }
+
+
+    /// <inheritdoc />
+    public void CreateMap<TSource, TTarget>(Func<TSource, TTarget, IAsyncDocumentSession, Task> map) where TTarget : class, new()
+    {   
+      Maps.Add<TSource, TTarget>(async (source, target) =>
+      {
+        await map((TSource)source, (TTarget)target, null);
+      });
     }
 
 
     /// <summary>
     /// Internal mappings cache
     /// </summary>
-    class MapCache : Dictionary<int, Dictionary<int, Action<object, object>>>
+    class MapCache : Dictionary<int, Dictionary<int, Func<object, object, Task>>>
     {
       int Index = 0;
 
@@ -122,14 +147,14 @@ namespace zero.Web.Mapper
       /// <summary>
       /// Adds a new action for the mapping
       /// </summary>
-      public void Add<TSource, TTarget>(Action<object, object> map)
+      public void Add<TSource, TTarget>(Func<object, object, Task> map)
       {
         int sourceKey = GetKeyForType(typeof(TSource));
         int targetKey = GetKeyForType(typeof(TTarget));
 
         if (!ContainsKey(sourceKey))
         {
-          Add(sourceKey, new Dictionary<int, Action<object, object>>());
+          Add(sourceKey, new Dictionary<int, Func<object, object, Task>>());
         }
 
         if (!this[sourceKey].ContainsKey(targetKey))
@@ -142,7 +167,7 @@ namespace zero.Web.Mapper
       /// <summary>
       /// Get action from defined types
       /// </summary>
-      public void Call<TSource, TTarget>(TSource source, TTarget target)
+      public async Task Call<TSource, TTarget>(TSource source, TTarget target)
       {
         int sourceKey = GetKeyForType(typeof(TSource));
         int targetKey = GetKeyForType(typeof(TTarget));
@@ -152,9 +177,9 @@ namespace zero.Web.Mapper
           return;
         }
 
-        Action<object, object> result = this[sourceKey][targetKey];
+        Func<object, object, Task> result = this[sourceKey][targetKey];
 
-        result(source, target);
+        await result(source, target);
       }
 
 
@@ -189,31 +214,34 @@ namespace zero.Web.Mapper
     /// <summary>
     /// Map an object to the target type
     /// </summary>
-    TTarget Map<TSource, TTarget>(TSource source) where TTarget : class, new();
+    Task<TTarget> Map<TSource, TTarget>(TSource source) where TTarget : class, new();
 
     /// <summary>
     /// Map an object to the target type given an already existing target instance
     /// </summary>
-    TTarget Map<TSource, TTarget>(TSource source, TTarget target) where TTarget : class, new();
+    Task<TTarget> Map<TSource, TTarget>(TSource source, TTarget target) where TTarget : class, new();
 
     /// <summary>
     /// Map a list of objects to the target type
     /// </summary>
-    IEnumerable<TTarget> Map<TSource, TTarget>(IEnumerable<TSource> source) where TTarget : class, new();
+    Task<IEnumerable<TTarget>> Map<TSource, TTarget>(IEnumerable<TSource> source) where TTarget : class, new();
 
     /// <summary>
     /// Map a list result containing objects to the target type
     /// </summary>
-    ListResult<TTarget> Map<TSource, TTarget>(ListResult<TSource> source) where TTarget : class, new();
+    Task<ListResult<TTarget>> Map<TSource, TTarget>(ListResult<TSource> source) where TTarget : class, new();
 
     /// <summary>
     /// Map an entity result to the target type
     /// </summary>
-    EntityResult<TTarget> Map<TSource, TTarget>(EntityResult<TSource> source) where TTarget : class, new();
+    Task<EntityResult<TTarget>> Map<TSource, TTarget>(EntityResult<TSource> source) where TTarget : class, new();
 
     /// <summary>
     /// Create a mapping from source to target object
     /// </summary>
     void CreateMap<TSource, TTarget>(Action<TSource, TTarget> map) where TTarget : class, new();
+
+    /// <inheritdoc />
+    void CreateMap<TSource, TTarget>(Func<TSource, TTarget, IAsyncDocumentSession, Task> map) where TTarget : class, new();
   }
 }
\ No newline at end of file
diff --git a/zero.Web/Mapper/IMapperConfig.cs b/zero.Web/Mapper/IMapperConfig.cs
index 024c57ad..c4aa4f32 100644
--- a/zero.Web/Mapper/IMapperConfig.cs
+++ b/zero.Web/Mapper/IMapperConfig.cs
@@ -1,4 +1,6 @@
-namespace zero.Web.Mapper
+using Raven.Client.Documents;
+
+namespace zero.Web.Mapper
 {
   public interface IMapperConfig
   {
diff --git a/zero.Web/Mapper/MapperServiceCollectionExtensions.cs b/zero.Web/Mapper/MapperServiceCollectionExtensions.cs
index 3843cdba..fccc02de 100644
--- a/zero.Web/Mapper/MapperServiceCollectionExtensions.cs
+++ b/zero.Web/Mapper/MapperServiceCollectionExtensions.cs
@@ -1,4 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
+using Raven.Client.Documents;
 using System;
 using zero.Core;
 using zero.Web.Mapper;
@@ -7,7 +8,7 @@ namespace zero.Web
 {
   public static class MapperServiceCollectionExtensions
   {
-    public static IServiceCollection AddMapper<T>(this IServiceCollection services) where T : class, IMapper, new()
+    public static IServiceCollection AddMapper<T>(this IServiceCollection services) where T : class, IMapper
     {
       return services.AddSingleton<IMapper, T>();
     }
@@ -24,6 +25,14 @@ namespace zero.Web
 
     public static IServiceCollection AddMapper(this IServiceCollection services) => services.AddMapper<DefaultMapper>();
 
-    public static IServiceCollection AddMapper(this IServiceCollection services, Action<IMapper> options) => services.AddMapper<DefaultMapper>(options);
+    public static IServiceCollection AddMapper(this IServiceCollection services, Action<DefaultMapper> options)
+    {
+      return services.AddSingleton<IMapper, DefaultMapper>(factory =>
+      {
+        DefaultMapper mapper = new DefaultMapper(factory.GetService<IDocumentStore>());
+        options(mapper);
+        return mapper;
+      });
+    }
   }
 }
diff --git a/zero.Web/Mapper/UserMapperConfig.cs b/zero.Web/Mapper/UserMapperConfig.cs
index 06732191..7402eb32 100644
--- a/zero.Web/Mapper/UserMapperConfig.cs
+++ b/zero.Web/Mapper/UserMapperConfig.cs
@@ -1,7 +1,10 @@
 using System;
 using System.Linq;
 using zero.Core.Entities;
+using zero.Core.Identity;
+using zero.Core.Extensions;
 using zero.Web.Models;
+using Raven.Client.Documents;
 
 namespace zero.Web.Mapper
 {
@@ -73,7 +76,17 @@ namespace zero.Web.Mapper
       {
         target.Id = source.Id;
         target.Name = source.Name;
-        target.CountClaims = source.Claims.Count;
+        target.Alias = source.Alias;
+        target.CountClaims = source.Claims.Count(x =>
+        {
+          string[] parts = x.Value.Split(':');
+
+          if (parts.Length < 2)
+          {
+            return true;
+          }
+          return parts[1] == PermissionsValue.True || parts[1] == PermissionsValue.Read || parts[1] == PermissionsValue.Write;
+        });
         target.Icon = source.Icon;
       });
     }
diff --git a/zero.Web/Models/UserRoleListModel.cs b/zero.Web/Models/UserRoleListModel.cs
index 20e11d3e..4a148721 100644
--- a/zero.Web/Models/UserRoleListModel.cs
+++ b/zero.Web/Models/UserRoleListModel.cs
@@ -7,5 +7,7 @@
     public int CountClaims { get; set; }
 
     public string Icon { get; set; }
+
+    public string Alias { get; set; }
   }
 }
diff --git a/zero.Web/ZeroBuilder.cs b/zero.Web/ZeroBuilder.cs
index 78c999ef..40f48c24 100644
--- a/zero.Web/ZeroBuilder.cs
+++ b/zero.Web/ZeroBuilder.cs
@@ -23,7 +23,7 @@ namespace zero.Web
 
       Services.AddOptions<ZeroOptions>().Configure(opts => ConfigureDefaults(opts));
 
-      Services.AddMapper<DefaultMapper>(opts =>
+      Services.AddMapper(opts =>
       {
         opts.Add<UserMapperConfig>();
         opts.Add<CountryMapperConfig>();