Fixed new service to use service call context in new location