Refactored base controllers