Better command handling on the server