Add some more arguments to allow remote server.