Begin to add AngularJS support