diff --git a/Gruntfile.js b/Gruntfile.js
index f29d4936a2..8c3b0ee594 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -23,6 +23,7 @@ module.exports = function (grunt) {
     var jsFilesToMinify = [
         'client/lib/jquery-2.1.4.min.js',
         'client/lib/underscore-min.js',
+        'client/lib/es6-promise.min.js',
         'client/lib/backbone-min.js',
         'client/lib/handlebars.js',
         'client/lib/base64.js',
diff --git a/application/Espo/Resources/metadata/clientDefs/Email.json b/application/Espo/Resources/metadata/clientDefs/Email.json
index 28448fb8e9..858adcf912 100644
--- a/application/Espo/Resources/metadata/clientDefs/Email.json
+++ b/application/Espo/Resources/metadata/clientDefs/Email.json
@@ -1,19 +1,20 @@
 {
    "controller": "controllers/record",
+   "acl": "acl/email",
    "model": "models/email",
-   "views":{
-      "list":"Email.List",
-      "detail":"Email.Detail"
+   "views": {
+      "list": "views/email/list",
+      "detail": "views/email/detail"
    },
    "recordViews":{
-      "list":"Email.Record.List",
-      "detail":"Email.Record.Detail",
-      "edit":"Email.Record.Edit",
-      "editQuick":"Email.Record.EditQuick",
-      "detailQuick":"Email.Record.DetailQuick"
+      "list": "views/email/record/list",
+      "detail": "views/email/record/detail",
+      "edit": "views/email/record/edit",
+      "editQuick":"views/email/record/edit-quick",
+      "detailQuick":"views/email/record/detail-quick"
    },
    "modalViews": {
-      "detail": "Email.Modals.Detail"
+      "detail": "views/email/modals/detail"
    },
    "menu": {
       "list": {
diff --git a/frontend/client/lib/es6-promise.min.js b/frontend/client/lib/es6-promise.min.js
new file mode 100644
index 0000000000..2d48351584
--- /dev/null
+++ b/frontend/client/lib/es6-promise.min.js
@@ -0,0 +1,9 @@
+/*!
+ * @overview es6-promise - a tiny implementation of Promises/A+.
+ * @copyright Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors (Conversion to ES6 API by Jake Archibald)
+ * @license   Licensed under MIT license
+ *            See https://raw.githubusercontent.com/jakearchibald/es6-promise/master/LICENSE
+ * @version   3.0.2
+ */
+
+(function(){"use strict";function lib$es6$promise$utils$$objectOrFunction(x){return typeof x==="function"||typeof x==="object"&&x!==null}function lib$es6$promise$utils$$isFunction(x){return typeof x==="function"}function lib$es6$promise$utils$$isMaybeThenable(x){return typeof x==="object"&&x!==null}var lib$es6$promise$utils$$_isArray;if(!Array.isArray){lib$es6$promise$utils$$_isArray=function(x){return Object.prototype.toString.call(x)==="[object Array]"}}else{lib$es6$promise$utils$$_isArray=Array.isArray}var lib$es6$promise$utils$$isArray=lib$es6$promise$utils$$_isArray;var lib$es6$promise$asap$$len=0;var lib$es6$promise$asap$$toString={}.toString;var lib$es6$promise$asap$$vertxNext;var lib$es6$promise$asap$$customSchedulerFn;var lib$es6$promise$asap$$asap=function asap(callback,arg){lib$es6$promise$asap$$queue[lib$es6$promise$asap$$len]=callback;lib$es6$promise$asap$$queue[lib$es6$promise$asap$$len+1]=arg;lib$es6$promise$asap$$len+=2;if(lib$es6$promise$asap$$len===2){if(lib$es6$promise$asap$$customSchedulerFn){lib$es6$promise$asap$$customSchedulerFn(lib$es6$promise$asap$$flush)}else{lib$es6$promise$asap$$scheduleFlush()}}};function lib$es6$promise$asap$$setScheduler(scheduleFn){lib$es6$promise$asap$$customSchedulerFn=scheduleFn}function lib$es6$promise$asap$$setAsap(asapFn){lib$es6$promise$asap$$asap=asapFn}var lib$es6$promise$asap$$browserWindow=typeof window!=="undefined"?window:undefined;var lib$es6$promise$asap$$browserGlobal=lib$es6$promise$asap$$browserWindow||{};var lib$es6$promise$asap$$BrowserMutationObserver=lib$es6$promise$asap$$browserGlobal.MutationObserver||lib$es6$promise$asap$$browserGlobal.WebKitMutationObserver;var lib$es6$promise$asap$$isNode=typeof process!=="undefined"&&{}.toString.call(process)==="[object process]";var lib$es6$promise$asap$$isWorker=typeof Uint8ClampedArray!=="undefined"&&typeof importScripts!=="undefined"&&typeof MessageChannel!=="undefined";function lib$es6$promise$asap$$useNextTick(){return function(){process.nextTick(lib$es6$promise$asap$$flush)}}function lib$es6$promise$asap$$useVertxTimer(){return function(){lib$es6$promise$asap$$vertxNext(lib$es6$promise$asap$$flush)}}function lib$es6$promise$asap$$useMutationObserver(){var iterations=0;var observer=new lib$es6$promise$asap$$BrowserMutationObserver(lib$es6$promise$asap$$flush);var node=document.createTextNode("");observer.observe(node,{characterData:true});return function(){node.data=iterations=++iterations%2}}function lib$es6$promise$asap$$useMessageChannel(){var channel=new MessageChannel;channel.port1.onmessage=lib$es6$promise$asap$$flush;return function(){channel.port2.postMessage(0)}}function lib$es6$promise$asap$$useSetTimeout(){return function(){setTimeout(lib$es6$promise$asap$$flush,1)}}var lib$es6$promise$asap$$queue=new Array(1e3);function lib$es6$promise$asap$$flush(){for(var i=0;i<lib$es6$promise$asap$$len;i+=2){var callback=lib$es6$promise$asap$$queue[i];var arg=lib$es6$promise$asap$$queue[i+1];callback(arg);lib$es6$promise$asap$$queue[i]=undefined;lib$es6$promise$asap$$queue[i+1]=undefined}lib$es6$promise$asap$$len=0}function lib$es6$promise$asap$$attemptVertx(){try{var r=require;var vertx=r("vertx");lib$es6$promise$asap$$vertxNext=vertx.runOnLoop||vertx.runOnContext;return lib$es6$promise$asap$$useVertxTimer()}catch(e){return lib$es6$promise$asap$$useSetTimeout()}}var lib$es6$promise$asap$$scheduleFlush;if(lib$es6$promise$asap$$isNode){lib$es6$promise$asap$$scheduleFlush=lib$es6$promise$asap$$useNextTick()}else if(lib$es6$promise$asap$$BrowserMutationObserver){lib$es6$promise$asap$$scheduleFlush=lib$es6$promise$asap$$useMutationObserver()}else if(lib$es6$promise$asap$$isWorker){lib$es6$promise$asap$$scheduleFlush=lib$es6$promise$asap$$useMessageChannel()}else if(lib$es6$promise$asap$$browserWindow===undefined&&typeof require==="function"){lib$es6$promise$asap$$scheduleFlush=lib$es6$promise$asap$$attemptVertx()}else{lib$es6$promise$asap$$scheduleFlush=lib$es6$promise$asap$$useSetTimeout()}function lib$es6$promise$$internal$$noop(){}var lib$es6$promise$$internal$$PENDING=void 0;var lib$es6$promise$$internal$$FULFILLED=1;var lib$es6$promise$$internal$$REJECTED=2;var lib$es6$promise$$internal$$GET_THEN_ERROR=new lib$es6$promise$$internal$$ErrorObject;function lib$es6$promise$$internal$$selfFulfillment(){return new TypeError("You cannot resolve a promise with itself")}function lib$es6$promise$$internal$$cannotReturnOwn(){return new TypeError("A promises callback cannot return that same promise.")}function lib$es6$promise$$internal$$getThen(promise){try{return promise.then}catch(error){lib$es6$promise$$internal$$GET_THEN_ERROR.error=error;return lib$es6$promise$$internal$$GET_THEN_ERROR}}function lib$es6$promise$$internal$$tryThen(then,value,fulfillmentHandler,rejectionHandler){try{then.call(value,fulfillmentHandler,rejectionHandler)}catch(e){return e}}function lib$es6$promise$$internal$$handleForeignThenable(promise,thenable,then){lib$es6$promise$asap$$asap(function(promise){var sealed=false;var error=lib$es6$promise$$internal$$tryThen(then,thenable,function(value){if(sealed){return}sealed=true;if(thenable!==value){lib$es6$promise$$internal$$resolve(promise,value)}else{lib$es6$promise$$internal$$fulfill(promise,value)}},function(reason){if(sealed){return}sealed=true;lib$es6$promise$$internal$$reject(promise,reason)},"Settle: "+(promise._label||" unknown promise"));if(!sealed&&error){sealed=true;lib$es6$promise$$internal$$reject(promise,error)}},promise)}function lib$es6$promise$$internal$$handleOwnThenable(promise,thenable){if(thenable._state===lib$es6$promise$$internal$$FULFILLED){lib$es6$promise$$internal$$fulfill(promise,thenable._result)}else if(thenable._state===lib$es6$promise$$internal$$REJECTED){lib$es6$promise$$internal$$reject(promise,thenable._result)}else{lib$es6$promise$$internal$$subscribe(thenable,undefined,function(value){lib$es6$promise$$internal$$resolve(promise,value)},function(reason){lib$es6$promise$$internal$$reject(promise,reason)})}}function lib$es6$promise$$internal$$handleMaybeThenable(promise,maybeThenable){if(maybeThenable.constructor===promise.constructor){lib$es6$promise$$internal$$handleOwnThenable(promise,maybeThenable)}else{var then=lib$es6$promise$$internal$$getThen(maybeThenable);if(then===lib$es6$promise$$internal$$GET_THEN_ERROR){lib$es6$promise$$internal$$reject(promise,lib$es6$promise$$internal$$GET_THEN_ERROR.error)}else if(then===undefined){lib$es6$promise$$internal$$fulfill(promise,maybeThenable)}else if(lib$es6$promise$utils$$isFunction(then)){lib$es6$promise$$internal$$handleForeignThenable(promise,maybeThenable,then)}else{lib$es6$promise$$internal$$fulfill(promise,maybeThenable)}}}function lib$es6$promise$$internal$$resolve(promise,value){if(promise===value){lib$es6$promise$$internal$$reject(promise,lib$es6$promise$$internal$$selfFulfillment())}else if(lib$es6$promise$utils$$objectOrFunction(value)){lib$es6$promise$$internal$$handleMaybeThenable(promise,value)}else{lib$es6$promise$$internal$$fulfill(promise,value)}}function lib$es6$promise$$internal$$publishRejection(promise){if(promise._onerror){promise._onerror(promise._result)}lib$es6$promise$$internal$$publish(promise)}function lib$es6$promise$$internal$$fulfill(promise,value){if(promise._state!==lib$es6$promise$$internal$$PENDING){return}promise._result=value;promise._state=lib$es6$promise$$internal$$FULFILLED;if(promise._subscribers.length!==0){lib$es6$promise$asap$$asap(lib$es6$promise$$internal$$publish,promise)}}function lib$es6$promise$$internal$$reject(promise,reason){if(promise._state!==lib$es6$promise$$internal$$PENDING){return}promise._state=lib$es6$promise$$internal$$REJECTED;promise._result=reason;lib$es6$promise$asap$$asap(lib$es6$promise$$internal$$publishRejection,promise)}function lib$es6$promise$$internal$$subscribe(parent,child,onFulfillment,onRejection){var subscribers=parent._subscribers;var length=subscribers.length;parent._onerror=null;subscribers[length]=child;subscribers[length+lib$es6$promise$$internal$$FULFILLED]=onFulfillment;subscribers[length+lib$es6$promise$$internal$$REJECTED]=onRejection;if(length===0&&parent._state){lib$es6$promise$asap$$asap(lib$es6$promise$$internal$$publish,parent)}}function lib$es6$promise$$internal$$publish(promise){var subscribers=promise._subscribers;var settled=promise._state;if(subscribers.length===0){return}var child,callback,detail=promise._result;for(var i=0;i<subscribers.length;i+=3){child=subscribers[i];callback=subscribers[i+settled];if(child){lib$es6$promise$$internal$$invokeCallback(settled,child,callback,detail)}else{callback(detail)}}promise._subscribers.length=0}function lib$es6$promise$$internal$$ErrorObject(){this.error=null}var lib$es6$promise$$internal$$TRY_CATCH_ERROR=new lib$es6$promise$$internal$$ErrorObject;function lib$es6$promise$$internal$$tryCatch(callback,detail){try{return callback(detail)}catch(e){lib$es6$promise$$internal$$TRY_CATCH_ERROR.error=e;return lib$es6$promise$$internal$$TRY_CATCH_ERROR}}function lib$es6$promise$$internal$$invokeCallback(settled,promise,callback,detail){var hasCallback=lib$es6$promise$utils$$isFunction(callback),value,error,succeeded,failed;if(hasCallback){value=lib$es6$promise$$internal$$tryCatch(callback,detail);if(value===lib$es6$promise$$internal$$TRY_CATCH_ERROR){failed=true;error=value.error;value=null}else{succeeded=true}if(promise===value){lib$es6$promise$$internal$$reject(promise,lib$es6$promise$$internal$$cannotReturnOwn());return}}else{value=detail;succeeded=true}if(promise._state!==lib$es6$promise$$internal$$PENDING){}else if(hasCallback&&succeeded){lib$es6$promise$$internal$$resolve(promise,value)}else if(failed){lib$es6$promise$$internal$$reject(promise,error)}else if(settled===lib$es6$promise$$internal$$FULFILLED){lib$es6$promise$$internal$$fulfill(promise,value)}else if(settled===lib$es6$promise$$internal$$REJECTED){lib$es6$promise$$internal$$reject(promise,value)}}function lib$es6$promise$$internal$$initializePromise(promise,resolver){try{resolver(function resolvePromise(value){lib$es6$promise$$internal$$resolve(promise,value)},function rejectPromise(reason){lib$es6$promise$$internal$$reject(promise,reason)})}catch(e){lib$es6$promise$$internal$$reject(promise,e)}}function lib$es6$promise$enumerator$$Enumerator(Constructor,input){var enumerator=this;enumerator._instanceConstructor=Constructor;enumerator.promise=new Constructor(lib$es6$promise$$internal$$noop);if(enumerator._validateInput(input)){enumerator._input=input;enumerator.length=input.length;enumerator._remaining=input.length;enumerator._init();if(enumerator.length===0){lib$es6$promise$$internal$$fulfill(enumerator.promise,enumerator._result)}else{enumerator.length=enumerator.length||0;enumerator._enumerate();if(enumerator._remaining===0){lib$es6$promise$$internal$$fulfill(enumerator.promise,enumerator._result)}}}else{lib$es6$promise$$internal$$reject(enumerator.promise,enumerator._validationError())}}lib$es6$promise$enumerator$$Enumerator.prototype._validateInput=function(input){return lib$es6$promise$utils$$isArray(input)};lib$es6$promise$enumerator$$Enumerator.prototype._validationError=function(){return new Error("Array Methods must be provided an Array")};lib$es6$promise$enumerator$$Enumerator.prototype._init=function(){this._result=new Array(this.length)};var lib$es6$promise$enumerator$$default=lib$es6$promise$enumerator$$Enumerator;lib$es6$promise$enumerator$$Enumerator.prototype._enumerate=function(){var enumerator=this;var length=enumerator.length;var promise=enumerator.promise;var input=enumerator._input;for(var i=0;promise._state===lib$es6$promise$$internal$$PENDING&&i<length;i++){enumerator._eachEntry(input[i],i)}};lib$es6$promise$enumerator$$Enumerator.prototype._eachEntry=function(entry,i){var enumerator=this;var c=enumerator._instanceConstructor;if(lib$es6$promise$utils$$isMaybeThenable(entry)){if(entry.constructor===c&&entry._state!==lib$es6$promise$$internal$$PENDING){entry._onerror=null;enumerator._settledAt(entry._state,i,entry._result)}else{enumerator._willSettleAt(c.resolve(entry),i)}}else{enumerator._remaining--;enumerator._result[i]=entry}};lib$es6$promise$enumerator$$Enumerator.prototype._settledAt=function(state,i,value){var enumerator=this;var promise=enumerator.promise;if(promise._state===lib$es6$promise$$internal$$PENDING){enumerator._remaining--;if(state===lib$es6$promise$$internal$$REJECTED){lib$es6$promise$$internal$$reject(promise,value)}else{enumerator._result[i]=value}}if(enumerator._remaining===0){lib$es6$promise$$internal$$fulfill(promise,enumerator._result)}};lib$es6$promise$enumerator$$Enumerator.prototype._willSettleAt=function(promise,i){var enumerator=this;lib$es6$promise$$internal$$subscribe(promise,undefined,function(value){enumerator._settledAt(lib$es6$promise$$internal$$FULFILLED,i,value)},function(reason){enumerator._settledAt(lib$es6$promise$$internal$$REJECTED,i,reason)})};function lib$es6$promise$promise$all$$all(entries){return new lib$es6$promise$enumerator$$default(this,entries).promise}var lib$es6$promise$promise$all$$default=lib$es6$promise$promise$all$$all;function lib$es6$promise$promise$race$$race(entries){var Constructor=this;var promise=new Constructor(lib$es6$promise$$internal$$noop);if(!lib$es6$promise$utils$$isArray(entries)){lib$es6$promise$$internal$$reject(promise,new TypeError("You must pass an array to race."));return promise}var length=entries.length;function onFulfillment(value){lib$es6$promise$$internal$$resolve(promise,value)}function onRejection(reason){lib$es6$promise$$internal$$reject(promise,reason)}for(var i=0;promise._state===lib$es6$promise$$internal$$PENDING&&i<length;i++){lib$es6$promise$$internal$$subscribe(Constructor.resolve(entries[i]),undefined,onFulfillment,onRejection)}return promise}var lib$es6$promise$promise$race$$default=lib$es6$promise$promise$race$$race;function lib$es6$promise$promise$resolve$$resolve(object){var Constructor=this;if(object&&typeof object==="object"&&object.constructor===Constructor){return object}var promise=new Constructor(lib$es6$promise$$internal$$noop);lib$es6$promise$$internal$$resolve(promise,object);return promise}var lib$es6$promise$promise$resolve$$default=lib$es6$promise$promise$resolve$$resolve;function lib$es6$promise$promise$reject$$reject(reason){var Constructor=this;var promise=new Constructor(lib$es6$promise$$internal$$noop);lib$es6$promise$$internal$$reject(promise,reason);return promise}var lib$es6$promise$promise$reject$$default=lib$es6$promise$promise$reject$$reject;var lib$es6$promise$promise$$counter=0;function lib$es6$promise$promise$$needsResolver(){throw new TypeError("You must pass a resolver function as the first argument to the promise constructor")}function lib$es6$promise$promise$$needsNew(){throw new TypeError("Failed to construct 'Promise': Please use the 'new' operator, this object constructor cannot be called as a function.")}var lib$es6$promise$promise$$default=lib$es6$promise$promise$$Promise;function lib$es6$promise$promise$$Promise(resolver){this._id=lib$es6$promise$promise$$counter++;this._state=undefined;this._result=undefined;this._subscribers=[];if(lib$es6$promise$$internal$$noop!==resolver){if(!lib$es6$promise$utils$$isFunction(resolver)){lib$es6$promise$promise$$needsResolver()}if(!(this instanceof lib$es6$promise$promise$$Promise)){lib$es6$promise$promise$$needsNew()}lib$es6$promise$$internal$$initializePromise(this,resolver)}}lib$es6$promise$promise$$Promise.all=lib$es6$promise$promise$all$$default;lib$es6$promise$promise$$Promise.race=lib$es6$promise$promise$race$$default;lib$es6$promise$promise$$Promise.resolve=lib$es6$promise$promise$resolve$$default;lib$es6$promise$promise$$Promise.reject=lib$es6$promise$promise$reject$$default;lib$es6$promise$promise$$Promise._setScheduler=lib$es6$promise$asap$$setScheduler;lib$es6$promise$promise$$Promise._setAsap=lib$es6$promise$asap$$setAsap;lib$es6$promise$promise$$Promise._asap=lib$es6$promise$asap$$asap;lib$es6$promise$promise$$Promise.prototype={constructor:lib$es6$promise$promise$$Promise,then:function(onFulfillment,onRejection){var parent=this;var state=parent._state;if(state===lib$es6$promise$$internal$$FULFILLED&&!onFulfillment||state===lib$es6$promise$$internal$$REJECTED&&!onRejection){return this}var child=new this.constructor(lib$es6$promise$$internal$$noop);var result=parent._result;if(state){var callback=arguments[state-1];lib$es6$promise$asap$$asap(function(){lib$es6$promise$$internal$$invokeCallback(state,child,callback,result)})}else{lib$es6$promise$$internal$$subscribe(parent,child,onFulfillment,onRejection)}return child},"catch":function(onRejection){return this.then(null,onRejection)}};function lib$es6$promise$polyfill$$polyfill(){var local;if(typeof global!=="undefined"){local=global}else if(typeof self!=="undefined"){local=self}else{try{local=Function("return this")()}catch(e){throw new Error("polyfill failed because global object is unavailable in this environment")}}var P=local.Promise;if(P&&Object.prototype.toString.call(P.resolve())==="[object Promise]"&&!P.cast){return}local.Promise=lib$es6$promise$promise$$default}var lib$es6$promise$polyfill$$default=lib$es6$promise$polyfill$$polyfill;var lib$es6$promise$umd$$ES6Promise={Promise:lib$es6$promise$promise$$default,polyfill:lib$es6$promise$polyfill$$default};if(typeof define==="function"&&define["amd"]){define(function(){return lib$es6$promise$umd$$ES6Promise})}else if(typeof module!=="undefined"&&module["exports"]){module["exports"]=lib$es6$promise$umd$$ES6Promise}else if(typeof this!=="undefined"){this["ES6Promise"]=lib$es6$promise$umd$$ES6Promise}lib$es6$promise$polyfill$$default()}).call(this);
\ No newline at end of file
diff --git a/frontend/client/src/acl-manager.js b/frontend/client/src/acl-manager.js
index 32f6ab0136..19bca12af5 100644
--- a/frontend/client/src/acl-manager.js
+++ b/frontend/client/src/acl-manager.js
@@ -44,7 +44,6 @@ Espo.define('acl-manager', ['acl'], function (Acl) {
         this.user = user || null;
 
         this.implementationHash = {};
-
         this.implementationClassMap = implementationClassMap || {};
     }
 
diff --git a/frontend/client/src/acl.js b/frontend/client/src/acl.js
index 31a3db30e6..1ed8ea5869 100644
--- a/frontend/client/src/acl.js
+++ b/frontend/client/src/acl.js
@@ -153,6 +153,8 @@ Espo.define('acl', [], function () {
         }
     });
 
+    Acl.extend = Backbone.Router.extend;
+
     return Acl;
 });
 
diff --git a/frontend/client/src/acl/email.js b/frontend/client/src/acl/email.js
new file mode 100644
index 0000000000..bcf2540fc8
--- /dev/null
+++ b/frontend/client/src/acl/email.js
@@ -0,0 +1,40 @@
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+Espo.define('acl/email', 'acl', function (Dep) {
+
+    return Dep.extend({
+
+        checkModel: function (model, data, action, precise) {
+            return Dep.prototype.checkModel.call(this, model, data, action, precise);
+        }
+
+    });
+
+});
+
diff --git a/frontend/client/src/app.js b/frontend/client/src/app.js
index 0f064b4b5b..4ba5d2b4c9 100644
--- a/frontend/client/src/app.js
+++ b/frontend/client/src/app.js
@@ -54,15 +54,25 @@ Espo.define(
         this.loader = Espo.loader;
         this.loader.cache = this.cache;
 
-        this._setupAjax();
+        this.setupAjax();
 
         this.settings = new Settings(null, {cache: this.cache});
         this.language = new Language(this.cache);
         this.metadata = new Metadata(this.cache);
         this.fieldManager = new FieldManager();
 
-
-        var proceed = function () {
+        Promise.all([
+            new Promise(function (resolve) {
+                this.settings.load(function () {
+                    resolve();
+                });
+            }.bind(this)),
+            new Promise(function (resolve) {
+                this.language.load(function () {
+                    resolve();
+                });
+            }.bind(this))
+        ]).then(function () {
             this.user = new User();
             this.preferences = new Preferences();
             this.preferences.settings = this.settings;
@@ -70,31 +80,19 @@ Espo.define(
 
             this.themeManager = new ThemeManager(this.settings, this.preferences, this.metadata);
 
-            this._modelFactory = new ModelFactory(this.loader, this.metadata, this.user);
-            this._collectionFactory = new CollectionFactory(this.loader, this._modelFactory);
+            this.modelFactory = new ModelFactory(this.loader, this.metadata, this.user);
+            this.collectionFactory = new CollectionFactory(this.loader, this.modelFactory);
 
-            this._initDateTime();
-            this._initView();
-            this._initBaseController();
+            this.initDateTime();
+            this.initView();
+            this.initBaseController();
 
-            this._preLoader = new PreLoader(this.cache, this._viewFactory, this.themeManager);
+            this.preLoader = new PreLoader(this.cache, this.viewFactory, this.themeManager);
 
-            this._preLoad(function () {
+            this.preLoad(function () {
                 callback.call(this, this);
             });
-        }.bind(this);
-
-
-        var countLoaded = 0;
-        var handleCallback = function () {
-            countLoaded++;
-            if (countLoaded == 2) {
-                proceed();
-            }
-        };
-
-        this.settings.load(handleCallback);
-        this.language.load(handleCallback);
+        }.bind(this));
     }
 
     _.extend(App.prototype, {
@@ -127,48 +125,74 @@ Espo.define(
 
         router: null,
 
-        _modelFactory: null,
-        _collectionFactory: null,
-        _viewFactory: null,
-        _viewLoader: null,
-        _viewHelper: null,
+        modelFactory: null,
+
+        collectionFactory: null,
+
+        viewFactory: null,
+
+        viewLoader: null,
+
+        viewHelper: null,
 
         start: function () {
-            this._initAuth();
-            var onAuth = function () {
-                this.metadata.load(function () {
-                    this.fieldManager.defs = this.metadata.get('fields');
-                    this.fieldManager.metadata = this.metadata;
-
-                    this.settings.defs = this.metadata.get('entityDefs.Settings');
-                    this.user.defs = this.metadata.get('entityDefs.User');
-                    this.preferences.defs = this.metadata.get('entityDefs.Preferences');
-
-                    if (this.themeManager.isUserTheme()) {
-                        $('#main-stylesheet').attr('href', this.themeManager.getStylesheet());
-                    }
-
-                    this.loader.addLibsConfig(this.metadata.get('app.jsLibs') || {});
-
-                    this._initRouter();
-                }.bind(this));
-            }.bind(this);
+            this.initAuth();
 
             if (!this.auth) {
                 this.baseController.login();
             } else {
-                this._initUserData(null, function () {
-                    onAuth();
-                });
+                this.initUserData(null, function () {
+                    this.onAuth.call(this);
+                }.bind(this));
             }
 
-            this.on('auth', onAuth);
+            this.on('auth', this.onAuth, this);
         },
 
-        _initRouter: function () {
+        onAuth: function () {
+            this.metadata.load(function () {
+                this.fieldManager.defs = this.metadata.get('fields');
+                this.fieldManager.metadata = this.metadata;
+
+                this.settings.defs = this.metadata.get('entityDefs.Settings');
+                this.user.defs = this.metadata.get('entityDefs.User');
+                this.preferences.defs = this.metadata.get('entityDefs.Preferences');
+
+                if (this.themeManager.isUserTheme()) {
+                    $('#main-stylesheet').attr('href', this.themeManager.getStylesheet());
+                }
+
+                this.loader.addLibsConfig(this.metadata.get('app.jsLibs') || {});
+
+                var promiseList = [];
+                var aclImplementationClassMap = {};
+
+                var clientDefs = this.metadata.get('clientDefs') || {};
+                Object.keys(clientDefs).forEach(function (scope) {
+                    var o = clientDefs[scope];
+                    var implClassName = (o || {}).acl;
+                    if (implClassName) {
+                        promiseList.push(new Promise(function (resolve) {
+                            this.loader.load(implClassName, function (implClass) {
+                                aclImplementationClassMap[scope] = implClass;
+                                resolve();
+                            });
+                        }.bind(this)))
+                    }
+                }, this);
+
+                Promise.all(promiseList).then(function () {
+                    this.acl.implementationClassMap = aclImplementationClassMap;
+                    this.initRouter();
+                }.bind(this));
+            }.bind(this));
+
+        },
+
+        initRouter: function () {
             this.router = new Router();
-            this._viewHelper.router = this.router;
-            this.baseController._router = this.router;
+            this.viewHelper.router = this.router;
+            this.baseController.setRouter(this.router);
             this.router.confirmLeaveOutMessage = this.language.translate('confirmLeaveOutMessage', 'messages');
             this.router.on('routed', function (params) {
                 this.doAction(params);
@@ -184,10 +208,10 @@ Espo.define(
             this.trigger('action', params);
 
             this.getController(params.controller, function (controller) {
-                //try {
+                try {
                     controller.doAction(params.action, params.options);
                     this.trigger('action:done');
-                /*} catch (e) {
+                } catch (e) {
                     switch (e.name) {
                         case 'AccessDenied':
                             this.baseController.error403();
@@ -198,20 +222,20 @@ Espo.define(
                         default:
                             throw e;
                     }
-                }*/
+                }
             }.bind(this));
         },
 
-        _initBaseController: function () {
+        initBaseController: function () {
             this.baseController = new BaseController({}, this.getControllerInjection());
-            this._viewHelper.baseController = this.baseController;
+            this.viewHelper.baseController = this.baseController;
         },
 
         getControllerInjection: function () {
             return {
-                viewFactory: this._viewFactory,
-                modelFactory: this._modelFactory,
-                collectionFactory: this._collectionFactory,
+                viewFactory: this.viewFactory,
+                modelFactory: this.modelFactory,
+                collectionFactory: this.collectionFactory,
                 settings: this.settings,
                 user: this.user,
                 preferences: this.preferences,
@@ -251,26 +275,27 @@ Espo.define(
             callback(this.controllers[name]);
         },
 
-        _preLoad: function (callback) {
-            this._preLoader.load(callback, this);
+        preLoad: function (callback) {
+            this.preLoader.load(callback, this);
         },
 
-        _initDateTime: function () {
+        initDateTime: function () {
             this.dateTime = new DateTime();
-            this._modelFactory.dateTime = this.dateTime;
+            this.modelFactory.dateTime = this.dateTime;
             this.dateTime.setSettingsAndPreferences(this.settings, this.preferences);
         },
 
-        _initView: function () {
+        initView: function () {
+
+            var helper = this.viewHelper = new ViewHelper();
 
-            var helper = this._viewHelper = new ViewHelper();
             helper.layoutManager = new LayoutManager({cache: this.cache});
             helper.settings = this.settings;
             helper.user = this.user;
             helper.preferences = this.preferences;
             helper.acl = this.acl;
-            helper.modelFactory = this._modelFactory;
-            helper.collectionFactory = this._collectionFactory;
+            helper.modelFactory = this.modelFactory;
+            helper.collectionFactory = this.collectionFactory;
             helper.storage = this.storage;
             helper.dateTime = this.dateTime;
             helper.language = this.language;
@@ -280,7 +305,7 @@ Espo.define(
             helper.storage = this.storage;
             helper.themeManager = this.themeManager;
 
-            this._viewLoader = function (viewName, callback) {
+            this.viewLoader = function (viewName, callback) {
                 Espo.require(Espo.Utils.composeViewClassName(viewName), callback);
             }.bind(this);
 
@@ -314,11 +339,11 @@ Espo.define(
                 return path;
             };
 
-            this._viewFactory = new Bull.Factory({
+            this.viewFactory = new Bull.Factory({
                 useCache: false,
-                defaultViewName: 'Base',
+                defaultViewName: 'views/base',
                 helper: helper,
-                viewLoader: this._viewLoader,
+                viewLoader: this.viewLoader,
                 resources: {
                     loaders: {
                         'template': function (name, callback) {
@@ -334,14 +359,14 @@ Espo.define(
             });
         },
 
-        _initAuth: function () {
+        initAuth: function () {
             this.auth = this.storage.get('user', 'auth') || null;
 
             this.baseController.on('login', function (data) {
                 this.auth = Base64.encode(data.auth.userName  + ':' + data.auth.token);
                 this.storage.set('user', 'auth', this.auth);
 
-                this._initUserData(data, function () {
+                this.initUserData(data, function () {
                     this.trigger('auth');
                 }.bind(this));
 
@@ -353,7 +378,6 @@ Espo.define(
         },
 
         logout: function () {
-
             if (this.auth) {
                 var arr = Base64.decode(this.auth).split(':');
                 if (arr.length > 1) {
@@ -381,10 +405,9 @@ Espo.define(
             xhr.abort();
         },
 
-        _initUserData: function (options, callback) {
+        initUserData: function (options, callback) {
             options = options || {};
 
-
             var userIsLoaded = false;
             var langIsLoaded = false;
 
@@ -445,7 +468,7 @@ Espo.define(
             }
         },
 
-        _setupAjax: function () {
+        setupAjax: function () {
             var self = this;
             $.ajaxSetup({
                 beforeSend: function (xhr, options) {
@@ -521,7 +544,6 @@ Espo.define(
     }, Backbone.Events);
 
     return App;
-
 });
 
 
diff --git a/frontend/client/src/controller.js b/frontend/client/src/controller.js
index f5e510742b..160511ea7f 100644
--- a/frontend/client/src/controller.js
+++ b/frontend/client/src/controller.js
@@ -67,6 +67,10 @@ Espo.define('controller', [], function () {
 
         initialize: function () {},
 
+        setRouter: function (router) {
+            this._router = router;
+        },
+
         getConfig: function () {
             return this._settings;
         },
diff --git a/frontend/client/src/model-offline.js b/frontend/client/src/model-offline.js
index 9afaf0224c..318f02df35 100644
--- a/frontend/client/src/model-offline.js
+++ b/frontend/client/src/model-offline.js
@@ -27,7 +27,7 @@
  ************************************************************************/
 
 
-Espo.define('model-offline', 'Model', function (Model) {
+Espo.define('model-offline', 'model', function (Model) {
 
     var ModelOffline = Model.extend({
 
diff --git a/frontend/html/main.html b/frontend/html/main.html
index 120a774642..ec3d427195 100644
--- a/frontend/html/main.html
+++ b/frontend/html/main.html
@@ -9,6 +9,7 @@
 
         <script type="text/javascript" src="client/lib/jquery-2.1.4.min.js"></script>
         <script type="text/javascript" src="client/lib/underscore-min.js"></script>
+        <script type="text/javascript" src="client/lib/es6-promise.min.js"></script>
         <script type="text/javascript" src="client/lib/backbone-min.js"></script>
         <script type="text/javascript" src="client/lib/handlebars.js"></script>
         <script type="text/javascript" src="client/lib/base64.js"></script>