Refactored to a remote service that uses a remote service delegate