Refactor the service delegation structure