Made Angular Enhancements