Added support for ng-grid