Refactored Service complete