Initial Service Refactored