Removed dependency on global angular