Added Angular Functionality