Added move methods on server and client