Refactored using shortcut methods in controller classes