Refactored Manager to Service