Update to use the new RemoteServiceFactory