Use new scheme for Service
Merge changes