Refactored to a remote service gateway instead of a remote service delegate