Adding back the remoting metadata