Using proper Angular controller approach
Removed legacy API