Improve communication with the server; resolves #3