Refactoring Remoting support