Update RemoteEndpointManager.java