Started to add support of angular.js