Modify the remote construction