Added AngularJS functionality