Controllers refactored