Added angularJS support