Refactored code to use explicit controllers
Refactored code to use explicit controllers