Added ng-grid support