Refactored controllers to use ServiceBase<>