refactoring code to use the custom urls in the services rather.