Rearchitecture the remoting implementation