diff --git a/.gitignore b/.gitignore
index bc6411d5..4a5dbf7f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 .DS_Store
 
 .idea
-node_modules
-bower_components
+/node_modules
+/bower_components
+dev.html
diff --git a/bower.json b/bower.json
index 84f0b1ad..7762fef0 100644
--- a/bower.json
+++ b/bower.json
@@ -1,9 +1,9 @@
 {
   "name": "ngHandsontable",
-  "version": "0.7.0-beta1",
+  "version": "0.7.0-beta2",
   "dependencies": {
     "angular": "~1.4",
-    "handsontable": "~0.17.0"
+    "handsontable": "~0.18.0"
   },
   "homepage": "https://github.com/handsontable/ngHandsontable",
   "authors": [
diff --git a/demo/build/app.js b/demo/build/app.js
index ea56de2f..93445f49 100644
--- a/demo/build/app.js
+++ b/demo/build/app.js
@@ -38,7 +38,7 @@ require=(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof requ
     }
     config.$inject = ['$sceDelegateProvider', '$httpProvider', '$stateProvider', '$compileProvider', '$urlRouterProvider', 'demoMapProvider'];
 
-    app.constant('version', 'v0.7.0-beta1');
+    app.constant('version', 'v0.7.0-beta2');
     app.config(config);
 
     angular.element(document).ready(function() {
@@ -318,6 +318,18 @@ require=(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof requ
         description: 'Enable copy/paste in context menu'
       }
     },
+    'pagination': {
+      'rows-pagination': {
+        url: getUrl('fohohenabo/1'),
+        title: 'Paginate rows',
+        description: 'Paginate rows'
+      },
+      'columns-pagination': {
+        url: getUrl('qudufogafu/1'),
+        title: 'Paginate columns',
+        description: 'Paginate columns'
+      },
+    },
     'other': {
       'access-to-instance': {
         url: getUrl('fovoxu/4'),
@@ -333,7 +345,7 @@ require=(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof requ
         url: getUrl('locome/2'),
         title: 'Custom renderer',
         description: 'Custom renderer'
-      }
+      },
     }
   };
 }());
diff --git a/demo/js/demos.js b/demo/js/demos.js
index 7069a393..508610d9 100644
--- a/demo/js/demos.js
+++ b/demo/js/demos.js
@@ -77,6 +77,18 @@
         description: 'Enable copy/paste in context menu'
       }
     },
+    'pagination': {
+      'rows-pagination': {
+        url: getUrl('fohohenabo/1'),
+        title: 'Paginate rows',
+        description: 'Paginate rows'
+      },
+      'columns-pagination': {
+        url: getUrl('qudufogafu/1'),
+        title: 'Paginate columns',
+        description: 'Paginate columns'
+      },
+    },
     'other': {
       'access-to-instance': {
         url: getUrl('fovoxu/4'),
@@ -92,7 +104,7 @@
         url: getUrl('locome/2'),
         title: 'Custom renderer',
         description: 'Custom renderer'
-      }
+      },
     }
   };
 }());
diff --git a/dist/ngHandsontable.js b/dist/ngHandsontable.js
index b8dac022..d20e8617 100644
--- a/dist/ngHandsontable.js
+++ b/dist/ngHandsontable.js
@@ -1,11 +1,11 @@
 /**
- * ngHandsontable 0.7.0-beta1
+ * ngHandsontable 0.7.0-beta2
  * 
  * Copyright 2012-2015 Marcin Warpechowski
  * Copyright 2015 Handsoncode sp. z o.o. <hello@handsontable.com>
  * Licensed under the MIT license.
  * https://github.com/handsontable/ngHandsontable
- * Date: Thu Aug 27 2015 15:02:29 GMT+0200 (CEST)
+ * Date: Fri Sep 11 2015 09:12:32 GMT+0200 (CEST)
 */
 
 if (document.all && !document.addEventListener) { // IE 8 and lower
@@ -20,8 +20,13 @@ angular.module('ngHandsontable', [
     'ngHandsontable.directives'
   ]);
 
+
+Handsontable.hooks.add('afterContextMenuShow', function() {
+  Handsontable.eventManager.isHotTableEnv = false;
+});
+
 (function() {
-  function autoCompleteFactory() {
+  function autoCompleteFactory($parse) {
     return {
       parseAutoComplete: function(column, dataSet, propertyOnly) {
         column.source = function(query, process) {
@@ -40,18 +45,21 @@ angular.module('ngHandsontable', [
           if (angular.isArray(options.object)) {
             source = options.object;
           } else {
-            var
-              objKeys = options.object.split('.'),
-              paramObject = data;
-
-            while (objKeys.length > 0) {
-              var key = objKeys.shift();
-              paramObject = paramObject[key];
-            }
-
-            if (propertyOnly) {
-              for (var i = 0, length = paramObject.length; i < length; i++) {
-                source.push(paramObject[i][options.property]);
+            // Using $parse to evaluate the expression against the row object
+            // allows us to support filters like the ngRepeat directive does.
+            var paramObject = $parse(options.object)(data);
+
+            if (angular.isArray(paramObject)) {
+              if (propertyOnly) {
+                for (var i = 0, length = paramObject.length; i < length; i++) {
+                  var item = paramObject[i][options.property];
+
+                  if (item !== null && item !== undefined) {
+                    source.push(item);
+                  }
+                }
+              } else {
+                source = paramObject;
               }
             } else {
               source = paramObject;
@@ -62,7 +70,7 @@ angular.module('ngHandsontable', [
       }
     };
   }
-  autoCompleteFactory.$inject = [];
+  autoCompleteFactory.$inject = ['$parse'];
 
   angular.module('ngHandsontable.services').factory('autoCompleteFactory', autoCompleteFactory);
 }());
@@ -170,7 +178,7 @@ angular.module('ngHandsontable', [
           htOptions, i, length;
 
         settings = settings || {};
-        angular.extend(scopeOptions, scope.settings);
+        angular.extend(scopeOptions, scope.settings || {});
         htOptions = this.getAvailableSettings();
 
         for (i = 0, length = htOptions.length; i < length; i++) {
@@ -195,14 +203,14 @@ angular.module('ngHandsontable', [
           htHooks, i, length, attribute;
 
         settings = settings || {};
-        angular.extend(scopeOptions, scope.settings);
+        angular.extend(scopeOptions, scope.settings || {});
         htHooks = this.getAvailableHooks();
 
         for (i = 0, length = htHooks.length; i < length; i++) {
           attribute = 'on' + ucFirst(htHooks[i]);
 
-          if (typeof scopeOptions[attribute] !== 'undefined') {
-            settings[htHooks[i]] = scopeOptions[attribute];
+          if (typeof scopeOptions[htHooks[i]] === 'function' || typeof scopeOptions[attribute] === 'function') {
+            settings[htHooks[i]] = scopeOptions[htHooks[i]] || scopeOptions[attribute];
           }
         }
 
@@ -375,7 +383,7 @@ angular.module('ngHandsontable', [
             $scope.column = {};
           }
           var optionList = {};
-          var match = options.match(/^\s*(.+)\s+in\s+(.*)\s*$/);
+          var match = options.match(/^\s*([\s\S]+?)\s+in\s+([\s\S]+?)\s*$/);
 
           if (match) {
             optionList.property = match[1];
@@ -401,12 +409,12 @@ angular.module('ngHandsontable', [
           };
         });
 
-        return function (scope, element, attributes, controllerInstance) {
+        return function (scope, element, attrs, controllerInstance) {
           var column = {};
 
           // Turn all attributes without value as `true` by default
-          angular.forEach(Object.keys(attributes), function(key) {
-            if (key.charAt(0) !== '$' && attributes[key] === '') {
+          angular.forEach(Object.keys(attrs), function(key) {
+            if (key.charAt(0) !== '$' && attrs[key] === '') {
               column[key] = true;
             }
           });
@@ -479,6 +487,13 @@ angular.module('ngHandsontable', [
           if (!scope.htSettings) {
             scope.htSettings = {};
           }
+          // Turn all attributes without value as `true` by default
+          angular.forEach(Object.keys(attrs), function(key) {
+            if (key.charAt(0) !== '$' && attrs[key] === '') {
+              scope.htSettings[key] = true;
+            }
+          });
+
           settingFactory.mergeSettingsFromScope(scope.htSettings, scope);
           settingFactory.mergeHooksFromScope(scope.htSettings, scope);
           scope.htSettings.data = scope.datarows;
@@ -493,7 +508,7 @@ angular.module('ngHandsontable', [
               }
               if (typeof scope.htSettings.columns[i].optionList === 'string') {
                 var optionList = {};
-                var match = scope.htSettings.columns[i].optionList.match(/^\s*(.+)\s+in\s+(.*)\s*$/);
+                var match = scope.htSettings.columns[i].optionList.match(/^\s*([\s\S]+?)\s+in\s+([\s\S]+?)\s*$/);
 
                 if (match) {
                   optionList.property = match[1];
@@ -506,8 +521,6 @@ angular.module('ngHandsontable', [
               autoCompleteFactory.parseAutoComplete(scope.htSettings.columns[i], scope.datarows, true);
             }
           }
-          scope.hotInstance = settingFactory.initializeHandsontable(element, scope.htSettings);
-
           var origAfterChange = scope.htSettings.afterChange;
 
           scope.htSettings.afterChange = function() {
@@ -518,20 +531,26 @@ angular.module('ngHandsontable', [
               scope.$apply();
             }
           };
+          scope.hotInstance = settingFactory.initializeHandsontable(element, scope.htSettings);
 
-          // TODO: Add watch properties descriptor + needs perf test watch equality vs toJson
+          // TODO: Add watch properties descriptor + needs perf test. Watch full equality vs toJson
           angular.forEach(bindingsKeys, function(key) {
-            scope.$watch(key, function(newValue) {
-              if (newValue === void 0) {
+            scope.$watch(key, function(newValue, oldValue) {
+              if (newValue === void 0 || newValue === oldValue) {
                 return;
               }
               if (key === 'datarows') {
-                settingFactory.renderHandsontable(scope.hotInstance);
+                // If reference to data rows is not changed then only re-render table
+                if (scope.hotInstance.getSettings().data === newValue) {
+                  settingFactory.renderHandsontable(scope.hotInstance);
+                } else {
+                  scope.hotInstance.loadData(newValue);
+                }
               } else {
                 scope.htSettings[key] = newValue;
                 settingFactory.updateHandsontableSettings(scope.hotInstance, scope.htSettings);
               }
-            }, ['datarows', 'columns', 'colWidths', 'rowHeaders'].indexOf(key) >= 0);
+            }, ['datarows', 'columns', 'rowHeights', 'colWidths', 'rowHeaders', 'colHeaders'].indexOf(key) >= 0);
           });
 
           /**
diff --git a/dist/ngHandsontable.min.js b/dist/ngHandsontable.min.js
index 3717eafe..a452c70f 100644
--- a/dist/ngHandsontable.min.js
+++ b/dist/ngHandsontable.min.js
@@ -1,11 +1,11 @@
 /**
- * ngHandsontable 0.7.0-beta1
+ * ngHandsontable 0.7.0-beta2
  * 
  * Copyright 2012-2015 Marcin Warpechowski
  * Copyright 2015 Handsoncode sp. z o.o. <hello@handsontable.com>
  * Licensed under the MIT license.
  * https://github.com/handsontable/ngHandsontable
- * Date: Thu Aug 27 2015 15:02:29 GMT+0200 (CEST)
+ * Date: Fri Sep 11 2015 09:12:32 GMT+0200 (CEST)
 */
 
-document.all&&!document.addEventListener&&(document.createElement("hot-table"),document.createElement("hot-column"),document.createElement("hot-autocomplete")),angular.module("ngHandsontable.services",[]),angular.module("ngHandsontable.directives",[]),angular.module("ngHandsontable",["ngHandsontable.services","ngHandsontable.directives"]),function(){function a(){return{parseAutoComplete:function(a,b,c){a.source=function(d,e){var f=this.instance.getSelected()[0],g=[],h=b[f];if(h){var i=a.optionList;if(i.object){if(angular.isArray(i.object))g=i.object;else{for(var j=i.object.split("."),k=h;j.length>0;){var l=j.shift();k=k[l]}if(c)for(var m=0,n=k.length;n>m;m++)g.push(k[m][i.property]);else g=k}e(g)}}}}}}a.$inject=[],angular.module("ngHandsontable.services").factory("autoCompleteFactory",a)}(),function(){function a(){var a={};return{getInstance:function(b){return a[b]},registerInstance:function(b,c){a[b]=c},removeInstance:function(b){a[b]=void 0}}}a.$inject=[],angular.module("ngHandsontable.services").factory("hotRegisterer",a)}(),function(){function a(a){return a.replace(/[A-Z]/g,function(a){return"-"+a.charAt(0).toLowerCase()})}function b(a){return a.substr(0,1).toUpperCase()+a.substr(1,a.length-1)}function c(c){return{containerClassName:"handsontable-container",initializeHandsontable:function(a,b){var d,e=document.createElement("div");return e.className=this.containerClassName,a[0].appendChild(e),d=new Handsontable(e,b),b.hotId&&c.registerInstance(b.hotId,d),d},updateHandsontableSettings:function(a,b){a&&a.updateSettings(b)},renderHandsontable:function(a){a&&a.render()},mergeSettingsFromScope:function(a,b){var c,d,e,f=angular.extend({},b);for(a=a||{},angular.extend(f,b.settings),c=this.getAvailableSettings(),d=0,e=c.length;e>d;d++)"undefined"!=typeof f[c[d]]&&(a[c[d]]=f[c[d]]);return a},mergeHooksFromScope:function(a,c){var d,e,f,g,h=angular.extend({},c);for(a=a||{},angular.extend(h,c.settings),d=this.getAvailableHooks(),e=0,f=d.length;f>e;e++)g="on"+b(d[e]),"undefined"!=typeof h[g]&&(a[d[e]]=h[g]);return a},trimScopeDefinitionAccordingToAttrs:function(a,b){for(var c in a)a.hasOwnProperty(c)&&void 0===b[c]&&void 0===b[a[c].substr(1,a[c].length)]&&delete a[c];return a},getTableScopeDefinition:function(){var a={};return this.applyAvailableSettingsScopeDef(a),this.applyAvailableHooksScopeDef(a),a.datarows="=",a.dataschema="=",a.observeDomVisibility="=",a.settings="=",a},getColumnScopeDefinition:function(){var a={};return this.applyAvailableSettingsScopeDef(a),a.data="@",a},applyAvailableSettingsScopeDef:function(a){var b,c,d;for(b=this.getAvailableSettings(),c=0,d=b.length;d>c;c++)a[b[c]]="=";return a},applyAvailableHooksScopeDef:function(a){var c,d,e;for(c=this.getAvailableHooks(),d=0,e=c.length;e>d;d++)a[c[d]]="=on"+b(c[d]);return a},getAvailableSettings:function(b){var c=Object.keys(Handsontable.DefaultSettings.prototype);return-1===c.indexOf("contextMenuCopyPaste")&&c.push("contextMenuCopyPaste"),b&&(c=c.map(a)),c},getAvailableHooks:function(b){var c=Handsontable.hooks.getRegistered();return b&&(c=c.map(function(b){return"on-"+a(b)})),c}}}c.$inject=["hotRegisterer"],angular.module("ngHandsontable.services").factory("settingFactory",c)}(),function(){function a(){return{restrict:"EA",scope:!0,require:"^hotColumn",link:function(a,b,c,d){var e=c.datarows;d.setColumnOptionList(e)}}}a.$inject=[],angular.module("ngHandsontable.directives").directive("hotAutocomplete",a)}(),function(){function a(a){return{restrict:"EA",require:"^hotTable",scope:{},controller:["$scope",function(a){this.setColumnOptionList=function(b){a.column||(a.column={});var c={},d=b.match(/^\s*(.+)\s+in\s+(.*)\s*$/);d?(c.property=d[1],c.object=d[2]):c.object=b.split(","),a.column.optionList=c}}],compile:function(b,c){var d=this;return this.scope=a.trimScopeDefinitionAccordingToAttrs(a.getColumnScopeDefinition(),c),angular.forEach(Object.keys(this.scope),function(a){d.$$isolateBindings[a]={attrName:a,collection:!1,mode:"data"===a?"@":"=",optional:!1}}),function(b,c,d,e){var f={};angular.forEach(Object.keys(d),function(a){"$"!==a.charAt(0)&&""===d[a]&&(f[a]=!0)}),a.mergeSettingsFromScope(f,b),b.column||(b.column={}),angular.extend(b.column,f),e.setColumnSetting(b.column),b.$on("$destroy",function(){e.removeColumnSetting(b.column)})}}}}a.$inject=["settingFactory"],angular.module("ngHandsontable.directives").directive("hotColumn",a)}(),function(){function a(a,b,c){return{restrict:"EA",scope:{},priority:-400,controller:["$scope",function(b){this.setColumnSetting=function(c){b.htSettings||(b.htSettings={}),b.htSettings.columns||(b.htSettings.columns=[]),b.htSettings.columns.push(c),a.updateHandsontableSettings(b.hotInstance,b.htSettings)},this.removeColumnSetting=function(c){b.htSettings.columns.indexOf(c)>-1&&(b.htSettings.columns.splice(b.htSettings.columns.indexOf(c),1),a.updateHandsontableSettings(b.hotInstance,b.htSettings))}}],compile:function(d,e){var f,g=this;return this.scope=a.trimScopeDefinitionAccordingToAttrs(a.getTableScopeDefinition(),e),f=Object.keys(this.scope),angular.forEach(f,function(a){var b=g.scope[a].charAt(0);g.$$isolateBindings[a]={attrName:g.scope[a].length>1?g.scope[a].substr(1,g.scope[a].length):a,collection:!1,mode:b,optional:!1}}),function(d,e,g){if(d.htSettings||(d.htSettings={}),a.mergeSettingsFromScope(d.htSettings,d),a.mergeHooksFromScope(d.htSettings,d),d.htSettings.data=d.datarows,d.htSettings.dataSchema=d.dataschema,d.htSettings.hotId=g.hotId,d.htSettings.observeDOMVisibility=d.observeDomVisibility,d.htSettings.columns)for(var h=0,i=d.htSettings.columns.length;i>h;h++)if("autocomplete"===d.htSettings.columns[h].type){if("string"==typeof d.htSettings.columns[h].optionList){var j={},k=d.htSettings.columns[h].optionList.match(/^\s*(.+)\s+in\s+(.*)\s*$/);k?(j.property=k[1],j.object=k[2]):j.object=j,d.htSettings.columns[h].optionList=j}b.parseAutoComplete(d.htSettings.columns[h],d.datarows,!0)}d.hotInstance=a.initializeHandsontable(e,d.htSettings);var l=d.htSettings.afterChange;d.htSettings.afterChange=function(){l&&l.apply(this,arguments),c.$$phase||d.$apply()},angular.forEach(f,function(b){d.$watch(b,function(c){void 0!==c&&("datarows"===b?a.renderHandsontable(d.hotInstance):(d.htSettings[b]=c,a.updateHandsontableSettings(d.hotInstance,d.htSettings)))},["datarows","columns","colWidths","rowHeaders"].indexOf(b)>=0)}),d.$watchCollection("datarows",function(b,c){c&&c.length===d.htSettings.minSpareRows&&b.length!==d.htSettings.minSpareRows&&(d.htSettings.data=d.datarows,a.updateHandsontableSettings(d.hotInstance,d.htSettings))})}}}}a.$inject=["settingFactory","autoCompleteFactory","$rootScope"],angular.module("ngHandsontable.directives").directive("hotTable",a)}();
\ No newline at end of file
+document.all&&!document.addEventListener&&(document.createElement("hot-table"),document.createElement("hot-column"),document.createElement("hot-autocomplete")),angular.module("ngHandsontable.services",[]),angular.module("ngHandsontable.directives",[]),angular.module("ngHandsontable",["ngHandsontable.services","ngHandsontable.directives"]),Handsontable.hooks.add("afterContextMenuShow",function(){Handsontable.eventManager.isHotTableEnv=!1}),function(){function a(a){return{parseAutoComplete:function(b,c,d){b.source=function(e,f){var g=this.instance.getSelected()[0],h=[],i=c[g];if(i){var j=b.optionList;if(j.object){if(angular.isArray(j.object))h=j.object;else{var k=a(j.object)(i);if(angular.isArray(k))if(d)for(var l=0,m=k.length;m>l;l++){var n=k[l][j.property];null!==n&&void 0!==n&&h.push(n)}else h=k;else h=k}f(h)}}}}}}a.$inject=["$parse"],angular.module("ngHandsontable.services").factory("autoCompleteFactory",a)}(),function(){function a(){var a={};return{getInstance:function(b){return a[b]},registerInstance:function(b,c){a[b]=c},removeInstance:function(b){a[b]=void 0}}}a.$inject=[],angular.module("ngHandsontable.services").factory("hotRegisterer",a)}(),function(){function a(a){return a.replace(/[A-Z]/g,function(a){return"-"+a.charAt(0).toLowerCase()})}function b(a){return a.substr(0,1).toUpperCase()+a.substr(1,a.length-1)}function c(c){return{containerClassName:"handsontable-container",initializeHandsontable:function(a,b){var d,e=document.createElement("div");return e.className=this.containerClassName,a[0].appendChild(e),d=new Handsontable(e,b),b.hotId&&c.registerInstance(b.hotId,d),d},updateHandsontableSettings:function(a,b){a&&a.updateSettings(b)},renderHandsontable:function(a){a&&a.render()},mergeSettingsFromScope:function(a,b){var c,d,e,f=angular.extend({},b);for(a=a||{},angular.extend(f,b.settings||{}),c=this.getAvailableSettings(),d=0,e=c.length;e>d;d++)"undefined"!=typeof f[c[d]]&&(a[c[d]]=f[c[d]]);return a},mergeHooksFromScope:function(a,c){var d,e,f,g,h=angular.extend({},c);for(a=a||{},angular.extend(h,c.settings||{}),d=this.getAvailableHooks(),e=0,f=d.length;f>e;e++)g="on"+b(d[e]),("function"==typeof h[d[e]]||"function"==typeof h[g])&&(a[d[e]]=h[d[e]]||h[g]);return a},trimScopeDefinitionAccordingToAttrs:function(a,b){for(var c in a)a.hasOwnProperty(c)&&void 0===b[c]&&void 0===b[a[c].substr(1,a[c].length)]&&delete a[c];return a},getTableScopeDefinition:function(){var a={};return this.applyAvailableSettingsScopeDef(a),this.applyAvailableHooksScopeDef(a),a.datarows="=",a.dataschema="=",a.observeDomVisibility="=",a.settings="=",a},getColumnScopeDefinition:function(){var a={};return this.applyAvailableSettingsScopeDef(a),a.data="@",a},applyAvailableSettingsScopeDef:function(a){var b,c,d;for(b=this.getAvailableSettings(),c=0,d=b.length;d>c;c++)a[b[c]]="=";return a},applyAvailableHooksScopeDef:function(a){var c,d,e;for(c=this.getAvailableHooks(),d=0,e=c.length;e>d;d++)a[c[d]]="=on"+b(c[d]);return a},getAvailableSettings:function(b){var c=Object.keys(Handsontable.DefaultSettings.prototype);return-1===c.indexOf("contextMenuCopyPaste")&&c.push("contextMenuCopyPaste"),b&&(c=c.map(a)),c},getAvailableHooks:function(b){var c=Handsontable.hooks.getRegistered();return b&&(c=c.map(function(b){return"on-"+a(b)})),c}}}c.$inject=["hotRegisterer"],angular.module("ngHandsontable.services").factory("settingFactory",c)}(),function(){function a(){return{restrict:"EA",scope:!0,require:"^hotColumn",link:function(a,b,c,d){var e=c.datarows;d.setColumnOptionList(e)}}}a.$inject=[],angular.module("ngHandsontable.directives").directive("hotAutocomplete",a)}(),function(){function a(a){return{restrict:"EA",require:"^hotTable",scope:{},controller:["$scope",function(a){this.setColumnOptionList=function(b){a.column||(a.column={});var c={},d=b.match(/^\s*([\s\S]+?)\s+in\s+([\s\S]+?)\s*$/);d?(c.property=d[1],c.object=d[2]):c.object=b.split(","),a.column.optionList=c}}],compile:function(b,c){var d=this;return this.scope=a.trimScopeDefinitionAccordingToAttrs(a.getColumnScopeDefinition(),c),angular.forEach(Object.keys(this.scope),function(a){d.$$isolateBindings[a]={attrName:a,collection:!1,mode:"data"===a?"@":"=",optional:!1}}),function(b,c,d,e){var f={};angular.forEach(Object.keys(d),function(a){"$"!==a.charAt(0)&&""===d[a]&&(f[a]=!0)}),a.mergeSettingsFromScope(f,b),b.column||(b.column={}),angular.extend(b.column,f),e.setColumnSetting(b.column),b.$on("$destroy",function(){e.removeColumnSetting(b.column)})}}}}a.$inject=["settingFactory"],angular.module("ngHandsontable.directives").directive("hotColumn",a)}(),function(){function a(a,b,c){return{restrict:"EA",scope:{},priority:-400,controller:["$scope",function(b){this.setColumnSetting=function(c){b.htSettings||(b.htSettings={}),b.htSettings.columns||(b.htSettings.columns=[]),b.htSettings.columns.push(c),a.updateHandsontableSettings(b.hotInstance,b.htSettings)},this.removeColumnSetting=function(c){b.htSettings.columns.indexOf(c)>-1&&(b.htSettings.columns.splice(b.htSettings.columns.indexOf(c),1),a.updateHandsontableSettings(b.hotInstance,b.htSettings))}}],compile:function(d,e){var f,g=this;return this.scope=a.trimScopeDefinitionAccordingToAttrs(a.getTableScopeDefinition(),e),f=Object.keys(this.scope),angular.forEach(f,function(a){var b=g.scope[a].charAt(0);g.$$isolateBindings[a]={attrName:g.scope[a].length>1?g.scope[a].substr(1,g.scope[a].length):a,collection:!1,mode:b,optional:!1}}),function(d,e,g){if(d.htSettings||(d.htSettings={}),angular.forEach(Object.keys(g),function(a){"$"!==a.charAt(0)&&""===g[a]&&(d.htSettings[a]=!0)}),a.mergeSettingsFromScope(d.htSettings,d),a.mergeHooksFromScope(d.htSettings,d),d.htSettings.data=d.datarows,d.htSettings.dataSchema=d.dataschema,d.htSettings.hotId=g.hotId,d.htSettings.observeDOMVisibility=d.observeDomVisibility,d.htSettings.columns)for(var h=0,i=d.htSettings.columns.length;i>h;h++)if("autocomplete"===d.htSettings.columns[h].type){if("string"==typeof d.htSettings.columns[h].optionList){var j={},k=d.htSettings.columns[h].optionList.match(/^\s*([\s\S]+?)\s+in\s+([\s\S]+?)\s*$/);k?(j.property=k[1],j.object=k[2]):j.object=j,d.htSettings.columns[h].optionList=j}b.parseAutoComplete(d.htSettings.columns[h],d.datarows,!0)}var l=d.htSettings.afterChange;d.htSettings.afterChange=function(){l&&l.apply(this,arguments),c.$$phase||d.$apply()},d.hotInstance=a.initializeHandsontable(e,d.htSettings),angular.forEach(f,function(b){d.$watch(b,function(c,e){void 0!==c&&c!==e&&("datarows"===b?d.hotInstance.getSettings().data===c?a.renderHandsontable(d.hotInstance):d.hotInstance.loadData(c):(d.htSettings[b]=c,a.updateHandsontableSettings(d.hotInstance,d.htSettings)))},["datarows","columns","rowHeights","colWidths","rowHeaders","colHeaders"].indexOf(b)>=0)}),d.$watchCollection("datarows",function(b,c){c&&c.length===d.htSettings.minSpareRows&&b.length!==d.htSettings.minSpareRows&&(d.htSettings.data=d.datarows,a.updateHandsontableSettings(d.hotInstance,d.htSettings))})}}}}a.$inject=["settingFactory","autoCompleteFactory","$rootScope"],angular.module("ngHandsontable.directives").directive("hotTable",a)}();
\ No newline at end of file
diff --git a/index.html b/index.html
index a3132d51..544ccd83 100644
--- a/index.html
+++ b/index.html
@@ -136,14 +136,14 @@ <h2>Code</h2>
   <script>hljs.initHighlightingOnLoad();</script>
   <script>
     (function() {
-      function MainCtrl(dataFactory) {
+      function MainCtrl($scope, dataFactory) {
         this.minSpareRows = 1;
         this.rowHeaders = false;
 
         this.db = {items: dataFactory.generateArrayOfObjects()};
         this.settings = {colHeaders: true, contextMenu: ['row_above', 'row_below', 'remove_row']};
       }
-      MainCtrl.$inject = ['dataFactory'];
+      MainCtrl.$inject = ['$scope', 'dataFactory'];
 
       angular.module('ngHandsontablePage', ['ngHandsontable']).controller('MainCtrl', MainCtrl);
     }());
diff --git a/package.json b/package.json
index d38505f9..8cf62b1a 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "url": "https://github.com/handsontable/ngHandsontable/issues"
   },
   "author": "Marcin Warpechowski <hello@handsontable.com>",
-  "version": "0.7.0-beta1",
+  "version": "0.7.0-beta2",
   "devDependencies": {
     "angular": "^1.4.2",
     "angular-mocks": "^1.4.2",
diff --git a/src/directives/hotColumn.js b/src/directives/hotColumn.js
index 60a43ba1..cfc09d37 100644
--- a/src/directives/hotColumn.js
+++ b/src/directives/hotColumn.js
@@ -13,7 +13,7 @@
             $scope.column = {};
           }
           var optionList = {};
-          var match = options.match(/^\s*(.+)\s+in\s+(.*)\s*$/);
+          var match = options.match(/^\s*([\s\S]+?)\s+in\s+([\s\S]+?)\s*$/);
 
           if (match) {
             optionList.property = match[1];
@@ -39,12 +39,12 @@
           };
         });
 
-        return function (scope, element, attributes, controllerInstance) {
+        return function (scope, element, attrs, controllerInstance) {
           var column = {};
 
           // Turn all attributes without value as `true` by default
-          angular.forEach(Object.keys(attributes), function(key) {
-            if (key.charAt(0) !== '$' && attributes[key] === '') {
+          angular.forEach(Object.keys(attrs), function(key) {
+            if (key.charAt(0) !== '$' && attrs[key] === '') {
               column[key] = true;
             }
           });
diff --git a/src/directives/hotTable.js b/src/directives/hotTable.js
index 87937058..a315cccf 100644
--- a/src/directives/hotTable.js
+++ b/src/directives/hotTable.js
@@ -47,6 +47,13 @@
           if (!scope.htSettings) {
             scope.htSettings = {};
           }
+          // Turn all attributes without value as `true` by default
+          angular.forEach(Object.keys(attrs), function(key) {
+            if (key.charAt(0) !== '$' && attrs[key] === '') {
+              scope.htSettings[key] = true;
+            }
+          });
+
           settingFactory.mergeSettingsFromScope(scope.htSettings, scope);
           settingFactory.mergeHooksFromScope(scope.htSettings, scope);
           scope.htSettings.data = scope.datarows;
@@ -61,7 +68,7 @@
               }
               if (typeof scope.htSettings.columns[i].optionList === 'string') {
                 var optionList = {};
-                var match = scope.htSettings.columns[i].optionList.match(/^\s*(.+)\s+in\s+(.*)\s*$/);
+                var match = scope.htSettings.columns[i].optionList.match(/^\s*([\s\S]+?)\s+in\s+([\s\S]+?)\s*$/);
 
                 if (match) {
                   optionList.property = match[1];
@@ -74,8 +81,6 @@
               autoCompleteFactory.parseAutoComplete(scope.htSettings.columns[i], scope.datarows, true);
             }
           }
-          scope.hotInstance = settingFactory.initializeHandsontable(element, scope.htSettings);
-
           var origAfterChange = scope.htSettings.afterChange;
 
           scope.htSettings.afterChange = function() {
@@ -86,20 +91,26 @@
               scope.$apply();
             }
           };
+          scope.hotInstance = settingFactory.initializeHandsontable(element, scope.htSettings);
 
-          // TODO: Add watch properties descriptor + needs perf test watch equality vs toJson
+          // TODO: Add watch properties descriptor + needs perf test. Watch full equality vs toJson
           angular.forEach(bindingsKeys, function(key) {
-            scope.$watch(key, function(newValue) {
-              if (newValue === void 0) {
+            scope.$watch(key, function(newValue, oldValue) {
+              if (newValue === void 0 || newValue === oldValue) {
                 return;
               }
               if (key === 'datarows') {
-                settingFactory.renderHandsontable(scope.hotInstance);
+                // If reference to data rows is not changed then only re-render table
+                if (scope.hotInstance.getSettings().data === newValue) {
+                  settingFactory.renderHandsontable(scope.hotInstance);
+                } else {
+                  scope.hotInstance.loadData(newValue);
+                }
               } else {
                 scope.htSettings[key] = newValue;
                 settingFactory.updateHandsontableSettings(scope.hotInstance, scope.htSettings);
               }
-            }, ['datarows', 'columns', 'colWidths', 'rowHeaders'].indexOf(key) >= 0);
+            }, ['datarows', 'columns', 'rowHeights', 'colWidths', 'rowHeaders', 'colHeaders'].indexOf(key) >= 0);
           });
 
           /**
diff --git a/src/ngHandsontable.js b/src/ngHandsontable.js
index 7fe3e58c..401488ae 100644
--- a/src/ngHandsontable.js
+++ b/src/ngHandsontable.js
@@ -4,3 +4,8 @@ angular.module('ngHandsontable', [
     'ngHandsontable.services',
     'ngHandsontable.directives'
   ]);
+
+
+Handsontable.hooks.add('afterContextMenuShow', function() {
+  Handsontable.eventManager.isHotTableEnv = false;
+});
diff --git a/src/services/autoCompleteFactory.js b/src/services/autoCompleteFactory.js
index ffeafe56..b25af6fe 100644
--- a/src/services/autoCompleteFactory.js
+++ b/src/services/autoCompleteFactory.js
@@ -1,5 +1,5 @@
 (function() {
-  function autoCompleteFactory() {
+  function autoCompleteFactory($parse) {
     return {
       parseAutoComplete: function(column, dataSet, propertyOnly) {
         column.source = function(query, process) {
@@ -18,18 +18,21 @@
           if (angular.isArray(options.object)) {
             source = options.object;
           } else {
-            var
-              objKeys = options.object.split('.'),
-              paramObject = data;
+            // Using $parse to evaluate the expression against the row object
+            // allows us to support filters like the ngRepeat directive does.
+            var paramObject = $parse(options.object)(data);
 
-            while (objKeys.length > 0) {
-              var key = objKeys.shift();
-              paramObject = paramObject[key];
-            }
+            if (angular.isArray(paramObject)) {
+              if (propertyOnly) {
+                for (var i = 0, length = paramObject.length; i < length; i++) {
+                  var item = paramObject[i][options.property];
 
-            if (propertyOnly) {
-              for (var i = 0, length = paramObject.length; i < length; i++) {
-                source.push(paramObject[i][options.property]);
+                  if (item !== null && item !== undefined) {
+                    source.push(item);
+                  }
+                }
+              } else {
+                source = paramObject;
               }
             } else {
               source = paramObject;
@@ -40,7 +43,7 @@
       }
     };
   }
-  autoCompleteFactory.$inject = [];
+  autoCompleteFactory.$inject = ['$parse'];
 
   angular.module('ngHandsontable.services').factory('autoCompleteFactory', autoCompleteFactory);
 }());
diff --git a/src/services/settingFactory.js b/src/services/settingFactory.js
index 7400cb71..9f0154d6 100644
--- a/src/services/settingFactory.js
+++ b/src/services/settingFactory.js
@@ -77,7 +77,7 @@
           htOptions, i, length;
 
         settings = settings || {};
-        angular.extend(scopeOptions, scope.settings);
+        angular.extend(scopeOptions, scope.settings || {});
         htOptions = this.getAvailableSettings();
 
         for (i = 0, length = htOptions.length; i < length; i++) {
@@ -102,14 +102,14 @@
           htHooks, i, length, attribute;
 
         settings = settings || {};
-        angular.extend(scopeOptions, scope.settings);
+        angular.extend(scopeOptions, scope.settings || {});
         htHooks = this.getAvailableHooks();
 
         for (i = 0, length = htHooks.length; i < length; i++) {
           attribute = 'on' + ucFirst(htHooks[i]);
 
-          if (typeof scopeOptions[attribute] !== 'undefined') {
-            settings[htHooks[i]] = scopeOptions[attribute];
+          if (typeof scopeOptions[htHooks[i]] === 'function' || typeof scopeOptions[attribute] === 'function') {
+            settings[htHooks[i]] = scopeOptions[htHooks[i]] || scopeOptions[attribute];
           }
         }
 
diff --git a/test/directives/hotColumn.spec.js b/test/directives/hotColumn.spec.js
index b5c02ced..a37bfd2f 100644
--- a/test/directives/hotColumn.spec.js
+++ b/test/directives/hotColumn.spec.js
@@ -26,181 +26,4 @@ describe('hotColumn', function() {
 
     expect(scope.hotInstance.getSettings().columns.length).toBe(3);
   });
-
-  it('should create table with `width` attribute in columns', function() {
-    rootScope.columns = [void 0, 100, 120];
-    var scope = angular.element(compile(
-        '<hot-table>' +
-          '<hot-column width="columns[0]"></hot-column>' +
-          '<hot-column width="columns[1]"></hot-column>' +
-          '<hot-column width="columns[2]"></hot-column>' +
-        '</hot-table>'
-      )(rootScope)).isolateScope();
-
-    scope.$digest();
-    var columns = scope.hotInstance.getSettings().columns;
-
-    expect(columns[0].width).toBe(void 0);
-    expect(columns[1].width).toBe(100);
-    expect(columns[2].width).toBe(120);
-  });
-
-  it('should create table with `title` attribute in columns', function() {
-    rootScope.columns = [void 0, 'foo', 'bar'];
-    var scope = angular.element(compile(
-        '<hot-table>' +
-          '<hot-column title="columns[0]"></hot-column>' +
-          '<hot-column title="columns[1]"></hot-column>' +
-          '<hot-column title="columns[2]"></hot-column>' +
-        '</hot-table>'
-      )(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    var columns = scope.hotInstance.getSettings().columns;
-
-    expect(columns[0].title).toBe(void 0);
-    expect(columns[1].title).toBe('foo');
-    expect(columns[2].title).toBe('bar');
-  });
-
-  it('should create table with `data` attribute in columns', function() {
-    rootScope.data = [{id: 4, name: 'John', gender: 'male'}];
-    var scope = angular.element(compile(
-        '<hot-table>' +
-          '<hot-column data="id"></hot-column>' +
-          '<hot-column data="name"></hot-column>' +
-          '<hot-column data="gender"></hot-column>' +
-        '</hot-table>'
-      )(rootScope)).isolateScope();
-
-    scope.$digest();
-    var columns = scope.hotInstance.getSettings().columns;
-
-    expect(columns[0].data).toBe('id');
-    expect(columns[1].data).toBe('name');
-    expect(columns[2].data).toBe('gender');
-  });
-
-  it('should create table with `type` attribute in columns', function() {
-    rootScope.types = ['text', 'numeric', 'date'];
-    var scope = angular.element(compile(
-        '<hot-table>' +
-          '<hot-column type="types[0]"></hot-column>' +
-          '<hot-column type="types[1]"></hot-column>' +
-          '<hot-column type="types[2]"></hot-column>' +
-        '</hot-table>'
-      )(rootScope)).isolateScope();
-
-    scope.$digest();
-    var columns = scope.hotInstance.getSettings().columns;
-
-    expect(columns[0].type).toBe('text');
-    expect(columns[1].type).toBe('numeric');
-    expect(columns[2].type).toBe('date');
-  });
-
-  it('should create table with `readOnly` attribute in columns', function() {
-    rootScope.readOnly = true;
-    var scope = angular.element(compile(
-        '<hot-table>' +
-          '<hot-column></hot-column>' +
-          '<hot-column read-only></hot-column>' +
-          '<hot-column read-only="readOnly"></hot-column>' +
-        '</hot-table>'
-      )(rootScope)).isolateScope();
-
-    scope.$digest();
-    var columns = scope.hotInstance.getSettings().columns;
-
-    expect(columns[0].readOnly).toBe(void 0);
-    expect(columns[1].readOnly).toBe(true);
-    expect(columns[2].readOnly).toBe(true);
-  });
-
-  it('should create table with `format` attribute in columns', function() {
-    rootScope.formats = [void 0, '$0', '0.0USD'];
-    var scope = angular.element(compile(
-        '<hot-table>' +
-          '<hot-column format="formats[0]"></hot-column>' +
-          '<hot-column format="formats[1]"></hot-column>' +
-          '<hot-column format="formats[2]"></hot-column>' +
-        '</hot-table>'
-      )(rootScope)).isolateScope();
-
-    scope.$digest();
-    var columns = scope.hotInstance.getSettings().columns;
-
-    expect(columns[0].format).toBe(void 0);
-    expect(columns[1].format).toBe('$0');
-    expect(columns[2].format).toBe('0.0USD');
-  });
-
-  it('should create table with `checkedTemplate` attribute in columns', function() {
-    rootScope.checkedTemplate = [true, 'Yes', 'Go'];
-    var scope = angular.element(compile(
-        '<hot-table>' +
-          '<hot-column checked-template="checkedTemplate[0]"></hot-column>' +
-          '<hot-column checked-template="checkedTemplate[1]"></hot-column>' +
-          '<hot-column checked-template="checkedTemplate[2]"></hot-column>' +
-        '</hot-table>'
-      )(rootScope)).isolateScope();
-
-    scope.$digest();
-    var columns = scope.hotInstance.getSettings().columns;
-
-    expect(columns[0].checkedTemplate).toBe(true);
-    expect(columns[1].checkedTemplate).toBe('Yes');
-    expect(columns[2].checkedTemplate).toBe('Go');
-  });
-
-  it('should create table with `uncheckedTemplate` attribute in columns', function() {
-    rootScope.uncheckedTemplate = [false, 'No', 'Stop'];
-    var scope = angular.element(compile(
-        '<hot-table>' +
-          '<hot-column unchecked-template="uncheckedTemplate[0]"></hot-column>' +
-          '<hot-column unchecked-template="uncheckedTemplate[1]"></hot-column>' +
-          '<hot-column unchecked-template="uncheckedTemplate[2]"></hot-column>' +
-        '</hot-table>'
-      )(rootScope)).isolateScope();
-
-    scope.$digest();
-    var columns = scope.hotInstance.getSettings().columns;
-
-    expect(columns[0].uncheckedTemplate).toBe(false);
-    expect(columns[1].uncheckedTemplate).toBe('No');
-    expect(columns[2].uncheckedTemplate).toBe('Stop');
-  });
-
-  it('should create table with `renderer` attribute in columns', function() {
-    rootScope.renderer = [function(){}, function(){}];
-    var scope = angular.element(compile(
-        '<hot-table>' +
-          '<hot-column renderer="renderer[0]"></hot-column>' +
-          '<hot-column renderer="renderer[1]"></hot-column>' +
-        '</hot-table>'
-      )(rootScope)).isolateScope();
-
-    scope.$digest();
-    var columns = scope.hotInstance.getSettings().columns;
-
-    expect(columns[0].renderer).toBe(rootScope.renderer[0]);
-    expect(columns[1].renderer).toBe(rootScope.renderer[1]);
-  });
-
-  it('should create table with `validator` attribute in columns', function() {
-    rootScope.validator = [/[0-9]/, function(){return true;}];
-    var scope = angular.element(compile(
-        '<hot-table>' +
-          '<hot-column validator="validator[0]"></hot-column>' +
-          '<hot-column validator="validator[1]"></hot-column>' +
-        '</hot-table>'
-      )(rootScope)).isolateScope();
-
-    scope.$digest();
-    var columns = scope.hotInstance.getSettings().columns;
-
-    expect(columns[0].validator).toBe(rootScope.validator[0]);
-    expect(columns[1].validator()).toBe(true);
-  });
 });
diff --git a/test/directives/hotColumn/watchingOptions.spec.js b/test/directives/hotColumn/watchingOptions.spec.js
new file mode 100644
index 00000000..afec8bff
--- /dev/null
+++ b/test/directives/hotColumn/watchingOptions.spec.js
@@ -0,0 +1,192 @@
+
+describe('hotColumn', function() {
+  var rootScope, compile;
+
+  beforeEach(module('ngHandsontable'));
+
+  beforeEach(inject(function(_$compile_, _$rootScope_, $q) {
+    rootScope = _$rootScope_;
+    compile = _$compile_;
+  }));
+
+  afterEach(function() {
+    angular.element(document.querySelector('hot-table')).remove();
+  });
+
+  it('should create table with `width` attribute in columns', function() {
+    rootScope.columns = [void 0, 100, 120];
+    var scope = angular.element(compile(
+        '<hot-table>' +
+          '<hot-column width="columns[0]"></hot-column>' +
+          '<hot-column width="columns[1]"></hot-column>' +
+          '<hot-column width="columns[2]"></hot-column>' +
+        '</hot-table>'
+      )(rootScope)).isolateScope();
+
+    scope.$digest();
+    var columns = scope.hotInstance.getSettings().columns;
+
+    expect(columns[0].width).toBe(void 0);
+    expect(columns[1].width).toBe(100);
+    expect(columns[2].width).toBe(120);
+  });
+
+  it('should create table with `title` attribute in columns', function() {
+    rootScope.columns = [void 0, 'foo', 'bar'];
+    var scope = angular.element(compile(
+        '<hot-table>' +
+          '<hot-column title="columns[0]"></hot-column>' +
+          '<hot-column title="columns[1]"></hot-column>' +
+          '<hot-column title="columns[2]"></hot-column>' +
+        '</hot-table>'
+      )(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    var columns = scope.hotInstance.getSettings().columns;
+
+    expect(columns[0].title).toBe(void 0);
+    expect(columns[1].title).toBe('foo');
+    expect(columns[2].title).toBe('bar');
+  });
+
+  it('should create table with `data` attribute in columns', function() {
+    rootScope.data = [{id: 4, name: 'John', gender: 'male'}];
+    var scope = angular.element(compile(
+        '<hot-table>' +
+          '<hot-column data="id"></hot-column>' +
+          '<hot-column data="name"></hot-column>' +
+          '<hot-column data="gender"></hot-column>' +
+        '</hot-table>'
+      )(rootScope)).isolateScope();
+
+    scope.$digest();
+    var columns = scope.hotInstance.getSettings().columns;
+
+    expect(columns[0].data).toBe('id');
+    expect(columns[1].data).toBe('name');
+    expect(columns[2].data).toBe('gender');
+  });
+
+  it('should create table with `type` attribute in columns', function() {
+    rootScope.types = ['text', 'numeric', 'date'];
+    var scope = angular.element(compile(
+        '<hot-table>' +
+          '<hot-column type="types[0]"></hot-column>' +
+          '<hot-column type="types[1]"></hot-column>' +
+          '<hot-column type="types[2]"></hot-column>' +
+        '</hot-table>'
+      )(rootScope)).isolateScope();
+
+    scope.$digest();
+    var columns = scope.hotInstance.getSettings().columns;
+
+    expect(columns[0].type).toBe('text');
+    expect(columns[1].type).toBe('numeric');
+    expect(columns[2].type).toBe('date');
+  });
+
+  it('should create table with `readOnly` attribute in columns', function() {
+    rootScope.readOnly = true;
+    var scope = angular.element(compile(
+        '<hot-table>' +
+          '<hot-column></hot-column>' +
+          '<hot-column read-only></hot-column>' +
+          '<hot-column read-only="readOnly"></hot-column>' +
+        '</hot-table>'
+      )(rootScope)).isolateScope();
+
+    scope.$digest();
+    var columns = scope.hotInstance.getSettings().columns;
+
+    expect(columns[0].readOnly).toBe(void 0);
+    expect(columns[1].readOnly).toBe(true);
+    expect(columns[2].readOnly).toBe(true);
+  });
+
+  it('should create table with `format` attribute in columns', function() {
+    rootScope.formats = [void 0, '$0', '0.0USD'];
+    var scope = angular.element(compile(
+        '<hot-table>' +
+          '<hot-column format="formats[0]"></hot-column>' +
+          '<hot-column format="formats[1]"></hot-column>' +
+          '<hot-column format="formats[2]"></hot-column>' +
+        '</hot-table>'
+      )(rootScope)).isolateScope();
+
+    scope.$digest();
+    var columns = scope.hotInstance.getSettings().columns;
+
+    expect(columns[0].format).toBe(void 0);
+    expect(columns[1].format).toBe('$0');
+    expect(columns[2].format).toBe('0.0USD');
+  });
+
+  it('should create table with `checkedTemplate` attribute in columns', function() {
+    rootScope.checkedTemplate = [true, 'Yes', 'Go'];
+    var scope = angular.element(compile(
+        '<hot-table>' +
+          '<hot-column checked-template="checkedTemplate[0]"></hot-column>' +
+          '<hot-column checked-template="checkedTemplate[1]"></hot-column>' +
+          '<hot-column checked-template="checkedTemplate[2]"></hot-column>' +
+        '</hot-table>'
+      )(rootScope)).isolateScope();
+
+    scope.$digest();
+    var columns = scope.hotInstance.getSettings().columns;
+
+    expect(columns[0].checkedTemplate).toBe(true);
+    expect(columns[1].checkedTemplate).toBe('Yes');
+    expect(columns[2].checkedTemplate).toBe('Go');
+  });
+
+  it('should create table with `uncheckedTemplate` attribute in columns', function() {
+    rootScope.uncheckedTemplate = [false, 'No', 'Stop'];
+    var scope = angular.element(compile(
+        '<hot-table>' +
+          '<hot-column unchecked-template="uncheckedTemplate[0]"></hot-column>' +
+          '<hot-column unchecked-template="uncheckedTemplate[1]"></hot-column>' +
+          '<hot-column unchecked-template="uncheckedTemplate[2]"></hot-column>' +
+        '</hot-table>'
+      )(rootScope)).isolateScope();
+
+    scope.$digest();
+    var columns = scope.hotInstance.getSettings().columns;
+
+    expect(columns[0].uncheckedTemplate).toBe(false);
+    expect(columns[1].uncheckedTemplate).toBe('No');
+    expect(columns[2].uncheckedTemplate).toBe('Stop');
+  });
+
+  it('should create table with `renderer` attribute in columns', function() {
+    rootScope.renderer = [function(){}, function(){}];
+    var scope = angular.element(compile(
+        '<hot-table>' +
+          '<hot-column renderer="renderer[0]"></hot-column>' +
+          '<hot-column renderer="renderer[1]"></hot-column>' +
+        '</hot-table>'
+      )(rootScope)).isolateScope();
+
+    scope.$digest();
+    var columns = scope.hotInstance.getSettings().columns;
+
+    expect(columns[0].renderer).toBe(rootScope.renderer[0]);
+    expect(columns[1].renderer).toBe(rootScope.renderer[1]);
+  });
+
+  it('should create table with `validator` attribute in columns', function() {
+    rootScope.validator = [/[0-9]/, function(){return true;}];
+    var scope = angular.element(compile(
+        '<hot-table>' +
+          '<hot-column validator="validator[0]"></hot-column>' +
+          '<hot-column validator="validator[1]"></hot-column>' +
+        '</hot-table>'
+      )(rootScope)).isolateScope();
+
+    scope.$digest();
+    var columns = scope.hotInstance.getSettings().columns;
+
+    expect(columns[0].validator).toBe(rootScope.validator[0]);
+    expect(columns[1].validator()).toBe(true);
+  });
+});
diff --git a/test/directives/hotTable.spec.js b/test/directives/hotTable.spec.js
index 5757a064..8fa83e25 100644
--- a/test/directives/hotTable.spec.js
+++ b/test/directives/hotTable.spec.js
@@ -59,798 +59,4 @@ describe('hotTable', function() {
       done();
     }, 100);
   });
-
-  it('should create table with `datarows` attribute', function() {
-    rootScope.value = [[]];
-    var scope = angular.element(compile('<hot-table datarows="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getData()).toBe(rootScope.value);
-  });
-
-  it('should create table with `dataSchema` attribute', function() {
-    rootScope.value = {id: null};
-    var scope = angular.element(compile('<hot-table dataschema="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSchema()).toBe(rootScope.value);
-  });
-
-  it('should create table with `width` attribute', function() {
-    rootScope.value = 333;
-    var scope = angular.element(compile('<hot-table width="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().width).toBe(rootScope.value);
-  });
-
-  it('should create table with `height` attribute', function() {
-    rootScope.value = 333;
-    var scope = angular.element(compile('<hot-table height="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().height).toBe(rootScope.value);
-  });
-
-  it('should create table with `startRows` attribute', function() {
-    rootScope.value = 12;
-    var scope = angular.element(compile('<hot-table start-rows="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().startRows).toBe(rootScope.value);
-  });
-
-  it('should create table with `startCols` attribute', function() {
-    rootScope.value = 12;
-    var scope = angular.element(compile('<hot-table start-cols="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().startCols).toBe(rootScope.value);
-  });
-
-  it('should create table with `rowHeaders` attribute', function() {
-    rootScope.value = function(index){return index + 'A'};
-    var scope = angular.element(compile('<hot-table row-headers="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().rowHeaders(1)).toBe('1A');
-  });
-
-  it('should create table with `colHeaders` attribute', function() {
-    rootScope.value = 'AAA';
-    var scope = angular.element(compile('<hot-table col-headers="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().colHeaders).toBe('AAA');
-  });
-
-  it('should create table with `colWidths` attribute', function() {
-    rootScope.value = [10, 20, 30];
-    var scope = angular.element(compile('<hot-table col-widths="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().colWidths).toBe(rootScope.value);
-  });
-
-  it('should create table with `columns` attribute', function() {
-    rootScope.value = [{width: 10, type: 'date'}, {type: 'numeric', format: '$0'}];
-    var scope = angular.element(compile('<hot-table columns="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().columns).toBe(rootScope.value);
-  });
-
-  it('should create table with `cells` attribute', function() {
-    rootScope.value = function(row, col, prop) { return [row, col, prop].join('|') };
-    var scope = angular.element(compile('<hot-table cells="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().cells(1, 2, 3)).toBe('1|2|3');
-  });
-
-  it('should create table with `cell` attribute', function() {
-    rootScope.value = function(row, col, prop) { return [row, col, prop].join('|') };
-    var scope = angular.element(compile('<hot-table cell="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().cell(1, 2, 3)).toBe('1|2|3');
-  });
-
-  it('should create table with `comments` attribute', function() {
-    rootScope.value = [{row: 1, col: 1, comment: 'Test'}];
-    var scope = angular.element(compile('<hot-table comments="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().comments).toBe(rootScope.value);
-  });
-
-  it('should create table with `customBorders` attribute', function() {
-    rootScope.value = [{range: {
-      from: {row: 1, col: 1},
-      to: {row: 3, col: 4}},
-      left: {},
-      right: {},
-      top: {},
-      bottom: {}
-    }];
-    var scope = angular.element(compile('<hot-table custom-borders="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().customBorders).toBe(rootScope.value);
-  });
-
-  it('should create table with `minRows` attribute', function() {
-    rootScope.value = 16;
-    var scope = angular.element(compile('<hot-table min-rows="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().minRows).toBe(rootScope.value);
-  });
-
-  it('should create table with `minCols` attribute', function() {
-    rootScope.value = 16;
-    var scope = angular.element(compile('<hot-table min-cols="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().minCols).toBe(rootScope.value);
-  });
-
-  it('should create table with `maxRows` attribute', function() {
-    rootScope.value = 16;
-    var scope = angular.element(compile('<hot-table max-rows="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().maxRows).toBe(rootScope.value);
-  });
-
-  it('should create table with `maxCols` attribute', function() {
-    rootScope.value = 16;
-    var scope = angular.element(compile('<hot-table max-cols="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().maxCols).toBe(rootScope.value);
-  });
-
-  it('should create table with `minSpareRows` attribute', function() {
-    rootScope.value = 16;
-    var scope = angular.element(compile('<hot-table min-spare-rows="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().minSpareRows).toBe(rootScope.value);
-  });
-
-  it('should create table with `minSpareCols` attribute', function() {
-    rootScope.value = 16;
-    var scope = angular.element(compile('<hot-table min-spare-cols="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().minSpareCols).toBe(rootScope.value);
-  });
-
-  it('should create table with `allowInsertRow` attribute', function() {
-    rootScope.value = false;
-    var scope = angular.element(compile('<hot-table allow-insert-row="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().allowInsertRow).toBe(rootScope.value);
-  });
-
-  it('should create table with `allowInsertColumn` attribute', function() {
-    rootScope.value = false;
-    var scope = angular.element(compile('<hot-table allow-insert-column="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().allowInsertColumn).toBe(rootScope.value);
-  });
-
-  it('should create table with `allowRemoveRow` attribute', function() {
-    rootScope.value = false;
-    var scope = angular.element(compile('<hot-table allow-remove-row="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().allowRemoveRow).toBe(rootScope.value);
-  });
-
-  it('should create table with `allowRemoveColumn` attribute', function() {
-    rootScope.value = false;
-    var scope = angular.element(compile('<hot-table allow-remove-column="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().allowRemoveColumn).toBe(rootScope.value);
-  });
-
-  it('should create table with `multiSelect` attribute', function() {
-    rootScope.value = false;
-    var scope = angular.element(compile('<hot-table multi-select="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().multiSelect).toBe(rootScope.value);
-  });
-
-  it('should create table with `multiSelect` attribute', function() {
-    rootScope.value = false;
-    var scope = angular.element(compile('<hot-table multi-select="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().multiSelect).toBe(rootScope.value);
-  });
-
-  it('should create table with `fillHandle` attribute', function() {
-    rootScope.value = false;
-    var scope = angular.element(compile('<hot-table fill-handle="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().fillHandle).toBe(rootScope.value);
-  });
-
-  it('should create table with `fixedRowsTop` attribute', function() {
-    rootScope.value = 12;
-    var scope = angular.element(compile('<hot-table fixed-rows-top="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().fixedRowsTop).toBe(rootScope.value);
-  });
-
-  it('should create table with `fixedColumnsLeft` attribute', function() {
-    rootScope.value = 12;
-    var scope = angular.element(compile('<hot-table fixed-columns-left="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().fixedColumnsLeft).toBe(rootScope.value);
-  });
-
-  it('should create table with `outsideClickDeselects` attribute', function() {
-    rootScope.value = false;
-    var scope = angular.element(compile('<hot-table outside-click-deselects="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().outsideClickDeselects).toBe(rootScope.value);
-  });
-
-  it('should create table with `enterBeginsEditing` attribute', function() {
-    rootScope.value = false;
-    var scope = angular.element(compile('<hot-table enter-begins-editing="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().enterBeginsEditing).toBe(rootScope.value);
-  });
-
-  it('should create table with `enterMoves` attribute', function() {
-    rootScope.value = {row: 3, col: 2};
-    var scope = angular.element(compile('<hot-table enter-moves="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().enterMoves).toBe(rootScope.value);
-  });
-
-  it('should create table with `tabMoves` attribute', function() {
-    rootScope.value = {row: 3, col: 2};
-    var scope = angular.element(compile('<hot-table tab-moves="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().tabMoves).toBe(rootScope.value);
-  });
-
-  it('should create table with `autoWrapRow` attribute', function() {
-    rootScope.value = true;
-    var scope = angular.element(compile('<hot-table auto-wrap-row="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().autoWrapRow).toBe(rootScope.value);
-  });
-
-  it('should create table with `autoWrapCol` attribute', function() {
-    rootScope.value = true;
-    var scope = angular.element(compile('<hot-table auto-wrap-col="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().autoWrapCol).toBe(rootScope.value);
-  });
-
-  it('should create table with `copyRowsLimit` attribute', function() {
-    rootScope.value = 563;
-    var scope = angular.element(compile('<hot-table copy-rows-limit="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().copyRowsLimit).toBe(rootScope.value);
-  });
-
-  it('should create table with `copyColsLimit` attribute', function() {
-    rootScope.value = 563;
-    var scope = angular.element(compile('<hot-table copy-cols-limit="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().copyColsLimit).toBe(rootScope.value);
-  });
-
-  it('should create table with `pasteMode` attribute', function() {
-    rootScope.value = 'test';
-    var scope = angular.element(compile('<hot-table paste-mode="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().pasteMode).toBe(rootScope.value);
-  });
-
-  it('should create table with `persistentState` attribute', function() {
-    rootScope.value = true;
-    var scope = angular.element(compile('<hot-table persistent-state="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().persistentState).toBe(rootScope.value);
-  });
-
-  it('should create table with `currentRowClassName` attribute', function() {
-    rootScope.value = 'class-name';
-    var scope = angular.element(compile('<hot-table current-row-class-name="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().currentRowClassName).toBe(rootScope.value);
-  });
-
-  it('should create table with `currentColClassName` attribute', function() {
-    rootScope.value = 'class-name';
-    var scope = angular.element(compile('<hot-table current-col-class-name="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().currentColClassName).toBe(rootScope.value);
-  });
-
-  it('should create table with `stretchH` attribute', function() {
-    rootScope.value = 'all';
-    var scope = angular.element(compile('<hot-table stretch-h="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().stretchH).toBe(rootScope.value);
-  });
-
-  it('should create table with `isEmptyRow` attribute', function() {
-    rootScope.value = function(a) {return a;};
-    var scope = angular.element(compile('<hot-table is-empty-row="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().isEmptyRow(2)).toBe(2);
-  });
-
-  it('should create table with `isEmptyCol` attribute', function() {
-    rootScope.value = function(a) {return a;};
-    var scope = angular.element(compile('<hot-table is-empty-col="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().isEmptyCol(2)).toBe(2);
-  });
-
-  it('should create table with `observeDOMVisibility` attribute', function() {
-    rootScope.value = false;
-    var scope = angular.element(compile('<hot-table observe-dom-visibility="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().observeDOMVisibility).toBe(rootScope.value);
-  });
-
-  it('should create table with `allowInvalid` attribute', function() {
-    rootScope.value = false;
-    var scope = angular.element(compile('<hot-table allow-invalid="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().allowInvalid).toBe(rootScope.value);
-  });
-
-  it('should create table with `invalidCellClassName` attribute', function() {
-    rootScope.value = 'class-name';
-    var scope = angular.element(compile('<hot-table invalid-cell-class-name="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().invalidCellClassName).toBe(rootScope.value);
-  });
-
-  it('should create table with `placeholder` attribute', function() {
-    rootScope.value = true;
-    var scope = angular.element(compile('<hot-table placeholder="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().placeholder).toBe(rootScope.value);
-  });
-
-  it('should create table with `placeholderCellClassName` attribute', function() {
-    rootScope.value = 'class-name';
-    var scope = angular.element(compile('<hot-table placeholder-cell-class-name="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().placeholderCellClassName).toBe(rootScope.value);
-  });
-
-  it('should create table with `readOnlyCellClassName` attribute', function() {
-    rootScope.value = 'class-name';
-    var scope = angular.element(compile('<hot-table read-only-cell-class-name="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().readOnlyCellClassName).toBe(rootScope.value);
-  });
-
-  it('should create table with `renderer` attribute', function() {
-    rootScope.value = 'numeric';
-    var scope = angular.element(compile('<hot-table renderer="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().renderer).toBe(rootScope.value);
-  });
-
-  it('should create table with `commentedCellClassName` attribute', function() {
-    rootScope.value = 'class-name';
-    var scope = angular.element(compile('<hot-table commented-cell-class-name="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().commentedCellClassName).toBe(rootScope.value);
-  });
-
-  it('should create table with `fragmentSelection` attribute', function() {
-    rootScope.value = true;
-    var scope = angular.element(compile('<hot-table fragment-selection="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().fragmentSelection).toBe(rootScope.value);
-  });
-
-  it('should create table with `readOnly` attribute', function() {
-    rootScope.value = true;
-    var scope = angular.element(compile('<hot-table read-only="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().readOnly).toBe(rootScope.value);
-  });
-
-  it('should create table with `search` attribute', function() {
-    rootScope.value = true;
-    var scope = angular.element(compile('<hot-table search="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().search).toBe(rootScope.value);
-  });
-
-  it('should create table with `type` attribute', function() {
-    rootScope.value = 'date';
-    var scope = angular.element(compile('<hot-table type="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().type).toBe(rootScope.value);
-  });
-
-  it('should create table with `copyable` attribute', function() {
-    rootScope.value = false;
-    var scope = angular.element(compile('<hot-table copyable="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().copyable).toBe(rootScope.value);
-  });
-
-  it('should create table with `editor` attribute', function() {
-    rootScope.value = 'date';
-    var scope = angular.element(compile('<hot-table editor="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().editor).toBe(rootScope.value);
-  });
-
-  it('should create table with `autoComplete` attribute', function() {
-    rootScope.value = true;
-    var scope = angular.element(compile('<hot-table auto-complete="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().autoComplete).toBe(rootScope.value);
-  });
-
-  it('should create table with `debug` attribute', function() {
-    rootScope.value = true;
-    var scope = angular.element(compile('<hot-table debug="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().debug).toBe(rootScope.value);
-  });
-
-  it('should create table with `wordWrap` attribute', function() {
-    rootScope.value = false;
-    var scope = angular.element(compile('<hot-table word-wrap="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().wordWrap).toBe(rootScope.value);
-  });
-
-  it('should create table with `noWordWrapClassName` attribute', function() {
-    rootScope.value = 'class-name';
-    var scope = angular.element(compile('<hot-table no-word-wrap-class-name="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().noWordWrapClassName).toBe(rootScope.value);
-  });
-
-  it('should create table with `contextMenu` attribute', function() {
-    rootScope.value = true;
-    var scope = angular.element(compile('<hot-table context-menu="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().contextMenu).toBe(rootScope.value);
-  });
-
-  it('should create table with `undo` attribute', function() {
-    rootScope.value = true;
-    var scope = angular.element(compile('<hot-table undo="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().undo).toBe(rootScope.value);
-  });
-
-  it('should create table with `columnSorting` attribute', function() {
-    rootScope.value = true;
-    var scope = angular.element(compile('<hot-table column-sorting="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().columnSorting).toBe(rootScope.value);
-  });
-
-  it('should create table with `manualColumnMove` attribute', function() {
-    rootScope.value = true;
-    var scope = angular.element(compile('<hot-table manual-column-move="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().manualColumnMove).toBe(rootScope.value);
-  });
-
-  it('should create table with `manualColumnResize` attribute', function() {
-    rootScope.value = true;
-    var scope = angular.element(compile('<hot-table manual-column-resize="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().manualColumnResize).toBe(rootScope.value);
-  });
-
-  it('should create table with `manualRowMove` attribute', function() {
-    rootScope.value = true;
-    var scope = angular.element(compile('<hot-table manual-row-move="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().manualRowMove).toBe(rootScope.value);
-  });
-
-  it('should create table with `manualRowResize` attribute', function() {
-    rootScope.value = true;
-    var scope = angular.element(compile('<hot-table manual-row-resize="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().manualRowResize).toBe(rootScope.value);
-  });
-
-  it('should create table with `mergeCells` attribute', function() {
-    rootScope.value = true;
-    var scope = angular.element(compile('<hot-table merge-cells="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().mergeCells).toBe(rootScope.value);
-  });
-
-  it('should create table with `viewportRowRenderingOffset` attribute', function() {
-    rootScope.value = 7;
-    var scope = angular.element(compile('<hot-table viewport-row-rendering-offset="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().viewportRowRenderingOffset).toBe(rootScope.value);
-  });
-
-  it('should create table with `viewportColumnRenderingOffset` attribute', function() {
-    rootScope.value = 7;
-    var scope = angular.element(compile('<hot-table viewport-column-rendering-offset="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().viewportColumnRenderingOffset).toBe(rootScope.value);
-  });
-
-  //it('should create table with `groups` attribute', function() {
-  //  rootScope.value = true;
-  //  var scope = angular.element(compile('<hot-table groups="value"></hot-table>')(rootScope)).isolateScope();
-  //
-  //  scope.$digest();
-  //
-  //  expect(scope.hotInstance.getSettings().groups).toBe(rootScope.value);
-  //});
-
-  it('should create table with `validator` attribute', function() {
-    rootScope.value = function(a) { return a === 1; };
-    var scope = angular.element(compile('<hot-table validator="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().validator(0)).toBe(false);
-    expect(scope.hotInstance.getSettings().validator(1)).toBe(true);
-  });
-
-  it('should create table with `disableVisualSelection` attribute', function() {
-    rootScope.value = true;
-    var scope = angular.element(compile('<hot-table disable-visual-selection="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().disableVisualSelection).toBe(rootScope.value);
-  });
-
-  it('should create table with `sortIndicator` attribute', function() {
-    rootScope.value = true;
-    var scope = angular.element(compile('<hot-table sort-indicator="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().sortIndicator).toBe(rootScope.value);
-  });
-
-  it('should create table with `manualColumnFreeze` attribute', function() {
-    rootScope.value = true;
-    var scope = angular.element(compile('<hot-table manual-column-freeze="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().manualColumnFreeze).toBe(rootScope.value);
-  });
-
-  it('should create table with `trimWhitespace` attribute', function() {
-    rootScope.value = false;
-    var scope = angular.element(compile('<hot-table trim-whitespace="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().trimWhitespace).toBe(rootScope.value);
-  });
-
-  it('should create table with `settings` attribute', function() {
-    rootScope.value = {width: 100, trimWhitespace: false, sortIndicator: true, columns: [{type: 'date'}]};
-    var scope = angular.element(compile('<hot-table settings="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().width).toBe(rootScope.value.width);
-    expect(scope.hotInstance.getSettings().trimWhitespace).toBe(rootScope.value.trimWhitespace);
-    expect(scope.hotInstance.getSettings().sortIndicator).toBe(rootScope.value.sortIndicator);
-    expect(scope.hotInstance.getSettings().columns).toBe(rootScope.value.columns);
-  });
-
-  it('should create table with `source` attribute', function() {
-    rootScope.value = ['a', 'b'];
-    var scope = angular.element(compile('<hot-table source="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().source).toBe(rootScope.value);
-  });
-
-  it('should create table with `title` attribute', function() {
-    rootScope.value = 'some title';
-    var scope = angular.element(compile('<hot-table title="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().title).toBe(rootScope.value);
-  });
-
-  it('should create table with `checkedTemplate` attribute', function() {
-    rootScope.value = 1;
-    var scope = angular.element(compile('<hot-table checked-template="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().checkedTemplate).toBe(rootScope.value);
-  });
-
-  it('should create table with `uncheckedTemplate` attribute', function() {
-    rootScope.value = -1;
-    var scope = angular.element(compile('<hot-table unchecked-template="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().uncheckedTemplate).toBe(rootScope.value);
-  });
-
-  it('should create table with `format` attribute', function() {
-    rootScope.value = '$0,0.0';
-    var scope = angular.element(compile('<hot-table format="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().format).toBe(rootScope.value);
-  });
-
-  it('should create table with `className` attribute', function() {
-    rootScope.value = 'class-name';
-    var scope = angular.element(compile('<hot-table class-name="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().className).toBe(rootScope.value);
-  });
-
-  it('should create table with `autoColumnSize` attribute', function() {
-    rootScope.value = true;
-    var scope = angular.element(compile('<hot-table auto-column-size="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().autoColumnSize).toBe(rootScope.value);
-  });
-
-  it('should create table with `autoRowSize` attribute', function() {
-    rootScope.value = true;
-    var scope = angular.element(compile('<hot-table auto-row-size="value"></hot-table>')(rootScope)).isolateScope();
-
-    scope.$digest();
-
-    expect(scope.hotInstance.getSettings().autoRowSize).toBe(rootScope.value);
-  });
 });
diff --git a/test/directives/hotTable/watchingHooks.spec.js b/test/directives/hotTable/watchingHooks.spec.js
new file mode 100644
index 00000000..e41da7a4
--- /dev/null
+++ b/test/directives/hotTable/watchingHooks.spec.js
@@ -0,0 +1,63 @@
+
+describe('hotTable - Attribute options watch', function() {
+  var rootScope, compile;
+
+  beforeEach(module('ngHandsontable'));
+
+  beforeEach(inject(function(_$compile_, _$rootScope_, $q, hotRegisterer) {
+    rootScope = _$rootScope_;
+    compile = _$compile_;
+    _hotRegisterer = hotRegisterer;
+  }));
+
+  afterEach(function() {
+    angular.element(document.querySelector('hot-table')).remove();
+  });
+
+  it('every hook defined in settings should be replaced by hook defined in attribute', function() {
+    rootScope.value = function() {};
+    rootScope.value2 = function() {};
+
+    spyOn(rootScope, 'value').and.callThrough();
+    spyOn(rootScope, 'value2').and.callThrough();
+
+    var scope = angular.element(compile('<hot-table settings="{onAfterChange: value}" on-after-change="value2"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(rootScope.value).not.toHaveBeenCalled();
+    expect(rootScope.value2).toHaveBeenCalled();
+  });
+
+  it('should call `afterChange` hook once after data changed (defined in settings object)', function() {
+    rootScope.value = function() {};
+    spyOn(rootScope, 'value').and.callThrough();
+
+    var scope = angular.element(compile('<hot-table settings="{onAfterChange: value}"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(rootScope.value).toHaveBeenCalled();
+    expect(rootScope.value.calls.count()).toBe(1);
+
+    scope.hotInstance.setDataAtCell(0, 0, '');
+
+    expect(rootScope.value.calls.count()).toBe(2);
+  });
+
+  it('should call `afterChange` hook once after data changed (defined in attribute)', function() {
+    rootScope.value = function() {};
+    spyOn(rootScope, 'value').and.callThrough();
+
+    var scope = angular.element(compile('<hot-table on-after-change="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(rootScope.value).toHaveBeenCalled();
+    expect(rootScope.value.calls.count()).toBe(1);
+
+    scope.hotInstance.setDataAtCell(0, 0, '');
+
+    expect(rootScope.value.calls.count()).toBe(2);
+  });
+});
diff --git a/test/directives/hotTable/watchingOptions.spec.js b/test/directives/hotTable/watchingOptions.spec.js
new file mode 100644
index 00000000..bd15ba81
--- /dev/null
+++ b/test/directives/hotTable/watchingOptions.spec.js
@@ -0,0 +1,820 @@
+
+describe('hotTable - Watching options', function() {
+  var rootScope, compile;
+
+  beforeEach(module('ngHandsontable'));
+
+  beforeEach(inject(function(_$compile_, _$rootScope_, $q, hotRegisterer) {
+    rootScope = _$rootScope_;
+    compile = _$compile_;
+    _hotRegisterer = hotRegisterer;
+  }));
+
+  afterEach(function() {
+    angular.element(document.querySelector('hot-table')).remove();
+  });
+
+  it('should create table with `datarows` attribute', function() {
+    rootScope.value = [[]];
+    var scope = angular.element(compile('<hot-table datarows="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getData()).toBe(rootScope.value);
+  });
+
+  it('should create table with `dataSchema` attribute', function() {
+    rootScope.value = {id: null};
+    var scope = angular.element(compile('<hot-table dataschema="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSchema()).toBe(rootScope.value);
+  });
+
+  it('should create table with `width` attribute', function() {
+    rootScope.value = 333;
+    var scope = angular.element(compile('<hot-table width="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().width).toBe(rootScope.value);
+  });
+
+  it('should create table with `height` attribute', function() {
+    rootScope.value = 333;
+    var scope = angular.element(compile('<hot-table height="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().height).toBe(rootScope.value);
+  });
+
+  it('should create table with `startRows` attribute', function() {
+    rootScope.value = 12;
+    var scope = angular.element(compile('<hot-table start-rows="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().startRows).toBe(rootScope.value);
+  });
+
+  it('should create table with `startCols` attribute', function() {
+    rootScope.value = 12;
+    var scope = angular.element(compile('<hot-table start-cols="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().startCols).toBe(rootScope.value);
+  });
+
+  it('should create table with `rowHeaders` attribute', function() {
+    rootScope.value = function(index){return index + 'A'};
+    var scope = angular.element(compile('<hot-table row-headers="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().rowHeaders(1)).toBe('1A');
+  });
+
+  it('should create table with `colHeaders` attribute', function() {
+    rootScope.value = 'AAA';
+    var scope = angular.element(compile('<hot-table col-headers="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().colHeaders).toBe('AAA');
+  });
+
+  it('should create table with `colWidths` attribute', function() {
+    rootScope.value = [10, 20, 30];
+    var scope = angular.element(compile('<hot-table col-widths="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().colWidths).toBe(rootScope.value);
+  });
+
+  it('should create table with `columns` attribute', function() {
+    rootScope.value = [{width: 10, type: 'date'}, {type: 'numeric', format: '$0'}];
+    var scope = angular.element(compile('<hot-table columns="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().columns).toBe(rootScope.value);
+  });
+
+  it('should create table with `cells` attribute', function() {
+    rootScope.value = function(row, col, prop) { return [row, col, prop].join('|') };
+    var scope = angular.element(compile('<hot-table cells="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().cells(1, 2, 3)).toBe('1|2|3');
+  });
+
+  it('should create table with `cell` attribute', function() {
+    rootScope.value = function(row, col, prop) { return [row, col, prop].join('|') };
+    var scope = angular.element(compile('<hot-table cell="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().cell(1, 2, 3)).toBe('1|2|3');
+  });
+
+  it('should create table with `comments` attribute', function() {
+    rootScope.value = [{row: 1, col: 1, comment: 'Test'}];
+    var scope = angular.element(compile('<hot-table comments="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().comments).toBe(rootScope.value);
+  });
+
+  it('should create table with `customBorders` attribute', function() {
+    rootScope.value = [{range: {
+      from: {row: 1, col: 1},
+      to: {row: 3, col: 4}},
+      left: {},
+      right: {},
+      top: {},
+      bottom: {}
+    }];
+    var scope = angular.element(compile('<hot-table custom-borders="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().customBorders).toBe(rootScope.value);
+  });
+
+  it('should create table with `minRows` attribute', function() {
+    rootScope.value = 16;
+    var scope = angular.element(compile('<hot-table min-rows="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().minRows).toBe(rootScope.value);
+  });
+
+  it('should create table with `minCols` attribute', function() {
+    rootScope.value = 16;
+    var scope = angular.element(compile('<hot-table min-cols="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().minCols).toBe(rootScope.value);
+  });
+
+  it('should create table with `maxRows` attribute', function() {
+    rootScope.value = 16;
+    var scope = angular.element(compile('<hot-table max-rows="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().maxRows).toBe(rootScope.value);
+  });
+
+  it('should create table with `maxCols` attribute', function() {
+    rootScope.value = 16;
+    var scope = angular.element(compile('<hot-table max-cols="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().maxCols).toBe(rootScope.value);
+  });
+
+  it('should create table with `minSpareRows` attribute', function() {
+    rootScope.value = 16;
+    var scope = angular.element(compile('<hot-table min-spare-rows="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().minSpareRows).toBe(rootScope.value);
+  });
+
+  it('should create table with `minSpareCols` attribute', function() {
+    rootScope.value = 16;
+    var scope = angular.element(compile('<hot-table min-spare-cols="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().minSpareCols).toBe(rootScope.value);
+  });
+
+  it('should create table with `allowInsertRow` attribute', function() {
+    rootScope.value = false;
+    var scope = angular.element(compile('<hot-table allow-insert-row="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().allowInsertRow).toBe(rootScope.value);
+  });
+
+  it('should create table with `allowInsertColumn` attribute', function() {
+    rootScope.value = false;
+    var scope = angular.element(compile('<hot-table allow-insert-column="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().allowInsertColumn).toBe(rootScope.value);
+  });
+
+  it('should create table with `allowRemoveRow` attribute', function() {
+    rootScope.value = false;
+    var scope = angular.element(compile('<hot-table allow-remove-row="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().allowRemoveRow).toBe(rootScope.value);
+  });
+
+  it('should create table with `allowRemoveColumn` attribute', function() {
+    rootScope.value = false;
+    var scope = angular.element(compile('<hot-table allow-remove-column="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().allowRemoveColumn).toBe(rootScope.value);
+  });
+
+  it('should create table with `multiSelect` attribute', function() {
+    rootScope.value = false;
+    var scope = angular.element(compile('<hot-table multi-select="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().multiSelect).toBe(rootScope.value);
+  });
+
+  it('should create table with `multiSelect` attribute', function() {
+    rootScope.value = false;
+    var scope = angular.element(compile('<hot-table multi-select="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().multiSelect).toBe(rootScope.value);
+  });
+
+  it('should create table with `fillHandle` attribute', function() {
+    rootScope.value = false;
+    var scope = angular.element(compile('<hot-table fill-handle="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().fillHandle).toBe(rootScope.value);
+  });
+
+  it('should create table with `fixedRowsTop` attribute', function() {
+    rootScope.value = 12;
+    var scope = angular.element(compile('<hot-table fixed-rows-top="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().fixedRowsTop).toBe(rootScope.value);
+  });
+
+  it('should create table with `fixedColumnsLeft` attribute', function() {
+    rootScope.value = 12;
+    var scope = angular.element(compile('<hot-table fixed-columns-left="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().fixedColumnsLeft).toBe(rootScope.value);
+  });
+
+  it('should create table with `outsideClickDeselects` attribute', function() {
+    rootScope.value = false;
+    var scope = angular.element(compile('<hot-table outside-click-deselects="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().outsideClickDeselects).toBe(rootScope.value);
+  });
+
+  it('should create table with `enterBeginsEditing` attribute', function() {
+    rootScope.value = false;
+    var scope = angular.element(compile('<hot-table enter-begins-editing="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().enterBeginsEditing).toBe(rootScope.value);
+  });
+
+  it('should create table with `enterMoves` attribute', function() {
+    rootScope.value = {row: 3, col: 2};
+    var scope = angular.element(compile('<hot-table enter-moves="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().enterMoves).toBe(rootScope.value);
+  });
+
+  it('should create table with `tabMoves` attribute', function() {
+    rootScope.value = {row: 3, col: 2};
+    var scope = angular.element(compile('<hot-table tab-moves="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().tabMoves).toBe(rootScope.value);
+  });
+
+  it('should create table with `autoWrapRow` attribute', function() {
+    rootScope.value = true;
+    var scope = angular.element(compile('<hot-table auto-wrap-row="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().autoWrapRow).toBe(rootScope.value);
+  });
+
+  it('should create table with `autoWrapCol` attribute', function() {
+    rootScope.value = true;
+    var scope = angular.element(compile('<hot-table auto-wrap-col="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().autoWrapCol).toBe(rootScope.value);
+  });
+
+  it('should create table with `copyRowsLimit` attribute', function() {
+    rootScope.value = 563;
+    var scope = angular.element(compile('<hot-table copy-rows-limit="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().copyRowsLimit).toBe(rootScope.value);
+  });
+
+  it('should create table with `copyColsLimit` attribute', function() {
+    rootScope.value = 563;
+    var scope = angular.element(compile('<hot-table copy-cols-limit="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().copyColsLimit).toBe(rootScope.value);
+  });
+
+  it('should create table with `pasteMode` attribute', function() {
+    rootScope.value = 'test';
+    var scope = angular.element(compile('<hot-table paste-mode="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().pasteMode).toBe(rootScope.value);
+  });
+
+  it('should create table with `persistentState` attribute', function() {
+    rootScope.value = true;
+    var scope = angular.element(compile('<hot-table persistent-state="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().persistentState).toBe(rootScope.value);
+  });
+
+  it('should create table with `currentRowClassName` attribute', function() {
+    rootScope.value = 'class-name';
+    var scope = angular.element(compile('<hot-table current-row-class-name="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().currentRowClassName).toBe(rootScope.value);
+  });
+
+  it('should create table with `currentColClassName` attribute', function() {
+    rootScope.value = 'class-name';
+    var scope = angular.element(compile('<hot-table current-col-class-name="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().currentColClassName).toBe(rootScope.value);
+  });
+
+  it('should create table with `stretchH` attribute', function() {
+    rootScope.value = 'all';
+    var scope = angular.element(compile('<hot-table stretch-h="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().stretchH).toBe(rootScope.value);
+  });
+
+  it('should create table with `isEmptyRow` attribute', function() {
+    rootScope.value = function(a) {return a;};
+    var scope = angular.element(compile('<hot-table is-empty-row="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().isEmptyRow(2)).toBe(2);
+  });
+
+  it('should create table with `isEmptyCol` attribute', function() {
+    rootScope.value = function(a) {return a;};
+    var scope = angular.element(compile('<hot-table is-empty-col="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().isEmptyCol(2)).toBe(2);
+  });
+
+  it('should create table with `observeDOMVisibility` attribute', function() {
+    rootScope.value = false;
+    var scope = angular.element(compile('<hot-table observe-dom-visibility="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().observeDOMVisibility).toBe(rootScope.value);
+  });
+
+  it('should create table with `allowInvalid` attribute', function() {
+    rootScope.value = false;
+    var scope = angular.element(compile('<hot-table allow-invalid="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().allowInvalid).toBe(rootScope.value);
+  });
+
+  it('should create table with `invalidCellClassName` attribute', function() {
+    rootScope.value = 'class-name';
+    var scope = angular.element(compile('<hot-table invalid-cell-class-name="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().invalidCellClassName).toBe(rootScope.value);
+  });
+
+  it('should create table with `placeholder` attribute', function() {
+    rootScope.value = true;
+    var scope = angular.element(compile('<hot-table placeholder="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().placeholder).toBe(rootScope.value);
+  });
+
+  it('should create table with `placeholderCellClassName` attribute', function() {
+    rootScope.value = 'class-name';
+    var scope = angular.element(compile('<hot-table placeholder-cell-class-name="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().placeholderCellClassName).toBe(rootScope.value);
+  });
+
+  it('should create table with `readOnlyCellClassName` attribute', function() {
+    rootScope.value = 'class-name';
+    var scope = angular.element(compile('<hot-table read-only-cell-class-name="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().readOnlyCellClassName).toBe(rootScope.value);
+  });
+
+  it('should create table with `renderer` attribute', function() {
+    rootScope.value = 'numeric';
+    var scope = angular.element(compile('<hot-table renderer="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().renderer).toBe(rootScope.value);
+  });
+
+  it('should create table with `commentedCellClassName` attribute', function() {
+    rootScope.value = 'class-name';
+    var scope = angular.element(compile('<hot-table commented-cell-class-name="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().commentedCellClassName).toBe(rootScope.value);
+  });
+
+  it('should create table with `fragmentSelection` attribute', function() {
+    rootScope.value = true;
+    var scope = angular.element(compile('<hot-table fragment-selection="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().fragmentSelection).toBe(rootScope.value);
+  });
+
+  it('should create table with `readOnly` attribute', function() {
+    rootScope.value = true;
+    var scope = angular.element(compile('<hot-table read-only="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().readOnly).toBe(rootScope.value);
+  });
+
+  it('should create table with `search` attribute', function() {
+    rootScope.value = true;
+    var scope = angular.element(compile('<hot-table search="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().search).toBe(rootScope.value);
+  });
+
+  it('should create table with `type` attribute', function() {
+    rootScope.value = 'date';
+    var scope = angular.element(compile('<hot-table type="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().type).toBe(rootScope.value);
+  });
+
+  it('should create table with `copyable` attribute', function() {
+    rootScope.value = false;
+    var scope = angular.element(compile('<hot-table copyable="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().copyable).toBe(rootScope.value);
+  });
+
+  it('should create table with `editor` attribute', function() {
+    rootScope.value = 'date';
+    var scope = angular.element(compile('<hot-table editor="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().editor).toBe(rootScope.value);
+  });
+
+  it('should create table with `autoComplete` attribute', function() {
+    rootScope.value = true;
+    var scope = angular.element(compile('<hot-table auto-complete="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().autoComplete).toBe(rootScope.value);
+  });
+
+  it('should create table with `debug` attribute', function() {
+    rootScope.value = true;
+    var scope = angular.element(compile('<hot-table debug="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().debug).toBe(rootScope.value);
+  });
+
+  it('should create table with `wordWrap` attribute', function() {
+    rootScope.value = false;
+    var scope = angular.element(compile('<hot-table word-wrap="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().wordWrap).toBe(rootScope.value);
+  });
+
+  it('should create table with `noWordWrapClassName` attribute', function() {
+    rootScope.value = 'class-name';
+    var scope = angular.element(compile('<hot-table no-word-wrap-class-name="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().noWordWrapClassName).toBe(rootScope.value);
+  });
+
+  it('should create table with `contextMenu` attribute', function() {
+    rootScope.value = true;
+    var scope = angular.element(compile('<hot-table context-menu="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().contextMenu).toBe(rootScope.value);
+  });
+
+  it('should create table with `undo` attribute', function() {
+    rootScope.value = true;
+    var scope = angular.element(compile('<hot-table undo="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().undo).toBe(rootScope.value);
+  });
+
+  it('should create table with `columnSorting` attribute', function() {
+    rootScope.value = true;
+    var scope = angular.element(compile('<hot-table column-sorting="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().columnSorting).toBe(rootScope.value);
+  });
+
+  it('should create table with `manualColumnMove` attribute', function() {
+    rootScope.value = true;
+    var scope = angular.element(compile('<hot-table manual-column-move="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().manualColumnMove).toBe(rootScope.value);
+  });
+
+  it('should create table with `manualColumnResize` attribute', function() {
+    rootScope.value = true;
+    var scope = angular.element(compile('<hot-table manual-column-resize="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().manualColumnResize).toBe(rootScope.value);
+  });
+
+  it('should create table with `manualRowMove` attribute', function() {
+    rootScope.value = true;
+    var scope = angular.element(compile('<hot-table manual-row-move="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().manualRowMove).toBe(rootScope.value);
+  });
+
+  it('should create table with `manualRowResize` attribute', function() {
+    rootScope.value = true;
+    var scope = angular.element(compile('<hot-table manual-row-resize="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().manualRowResize).toBe(rootScope.value);
+  });
+
+  it('should create table with `mergeCells` attribute', function() {
+    rootScope.value = true;
+    var scope = angular.element(compile('<hot-table merge-cells="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().mergeCells).toBe(rootScope.value);
+  });
+
+  it('should create table with `viewportRowRenderingOffset` attribute', function() {
+    rootScope.value = 7;
+    var scope = angular.element(compile('<hot-table viewport-row-rendering-offset="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().viewportRowRenderingOffset).toBe(rootScope.value);
+  });
+
+  it('should create table with `viewportColumnRenderingOffset` attribute', function() {
+    rootScope.value = 7;
+    var scope = angular.element(compile('<hot-table viewport-column-rendering-offset="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().viewportColumnRenderingOffset).toBe(rootScope.value);
+  });
+
+  //it('should create table with `groups` attribute', function() {
+  //  rootScope.value = true;
+  //  var scope = angular.element(compile('<hot-table groups="value"></hot-table>')(rootScope)).isolateScope();
+  //
+  //  scope.$digest();
+  //
+  //  expect(scope.hotInstance.getSettings().groups).toBe(rootScope.value);
+  //});
+
+  it('should create table with `validator` attribute', function() {
+    rootScope.value = function(a) { return a === 1; };
+    var scope = angular.element(compile('<hot-table validator="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().validator(0)).toBe(false);
+    expect(scope.hotInstance.getSettings().validator(1)).toBe(true);
+  });
+
+  it('should create table with `disableVisualSelection` attribute', function() {
+    rootScope.value = true;
+    var scope = angular.element(compile('<hot-table disable-visual-selection="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().disableVisualSelection).toBe(rootScope.value);
+  });
+
+  it('should create table with `sortIndicator` attribute', function() {
+    rootScope.value = true;
+    var scope = angular.element(compile('<hot-table sort-indicator="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().sortIndicator).toBe(rootScope.value);
+  });
+
+  it('should create table with `manualColumnFreeze` attribute', function() {
+    rootScope.value = true;
+    var scope = angular.element(compile('<hot-table manual-column-freeze="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().manualColumnFreeze).toBe(rootScope.value);
+  });
+
+  it('should create table with `trimWhitespace` attribute', function() {
+    rootScope.value = false;
+    var scope = angular.element(compile('<hot-table trim-whitespace="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().trimWhitespace).toBe(rootScope.value);
+  });
+
+  it('should create table with `settings` attribute', function() {
+    rootScope.value = {width: 100, trimWhitespace: false, sortIndicator: true, columns: [{type: 'date'}]};
+    var scope = angular.element(compile('<hot-table settings="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().width).toBe(rootScope.value.width);
+    expect(scope.hotInstance.getSettings().trimWhitespace).toBe(rootScope.value.trimWhitespace);
+    expect(scope.hotInstance.getSettings().sortIndicator).toBe(rootScope.value.sortIndicator);
+    expect(scope.hotInstance.getSettings().columns).toBe(rootScope.value.columns);
+  });
+
+  it('should create table with `source` attribute', function() {
+    rootScope.value = ['a', 'b'];
+    var scope = angular.element(compile('<hot-table source="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().source).toBe(rootScope.value);
+  });
+
+  it('should create table with `title` attribute', function() {
+    rootScope.value = 'some title';
+    var scope = angular.element(compile('<hot-table title="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().title).toBe(rootScope.value);
+  });
+
+  it('should create table with `checkedTemplate` attribute', function() {
+    rootScope.value = 1;
+    var scope = angular.element(compile('<hot-table checked-template="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().checkedTemplate).toBe(rootScope.value);
+  });
+
+  it('should create table with `uncheckedTemplate` attribute', function() {
+    rootScope.value = -1;
+    var scope = angular.element(compile('<hot-table unchecked-template="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().uncheckedTemplate).toBe(rootScope.value);
+  });
+
+  it('should create table with `format` attribute', function() {
+    rootScope.value = '$0,0.0';
+    var scope = angular.element(compile('<hot-table format="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().format).toBe(rootScope.value);
+  });
+
+  it('should create table with `className` attribute', function() {
+    rootScope.value = 'class-name';
+    var scope = angular.element(compile('<hot-table class-name="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().className).toBe(rootScope.value);
+  });
+
+  it('should create table with `autoColumnSize` attribute', function() {
+    rootScope.value = true;
+    var scope = angular.element(compile('<hot-table auto-column-size="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().autoColumnSize).toBe(rootScope.value);
+  });
+
+  it('should create table with `autoRowSize` attribute', function() {
+    rootScope.value = true;
+    var scope = angular.element(compile('<hot-table auto-row-size="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().autoRowSize).toBe(rootScope.value);
+  });
+
+  it('should convert attributes without values as `true`', function() {
+    rootScope.value = true;
+    var scope = angular.element(compile('<hot-table read-only row-headers></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().rowHeaders).toBe(true);
+    expect(scope.hotInstance.getSettings().readOnly).toBe(true);
+  });
+});
diff --git a/test/services/settingFactory.spec.js b/test/services/settingFactory.spec.js
index 1fa0ccef..a9a47e98 100644
--- a/test/services/settingFactory.spec.js
+++ b/test/services/settingFactory.spec.js
@@ -80,9 +80,9 @@ describe('settingFactory', function() {
     var scopeMock = {
       afterInit: fnAfterInit,
       settings: {
-        beforeInit: fnBeforeInit
+        onBeforeInit: fnBeforeInit
       },
-      afterChange: void 0
+      onAfterChange: void 0
     };
     var settings = {
       afterChange: fnAfterChange
@@ -90,8 +90,8 @@ describe('settingFactory', function() {
 
     settingFactory.mergeHooksFromScope(settings, scopeMock);
 
-    expect(settings.afterInit).toBe(fnAfterInit());
-    expect(settings.beforeInit).toBe(fnBeforeInit());
+    expect(settings.afterInit).toBe(fnAfterInit);
+    expect(settings.beforeInit).toBe(fnBeforeInit);
     expect(settings.afterChange).toBe(fnAfterChange);
   }));