Adding ability to add a custom service
Fixing merge conflict