RemoteFacade refactoring