Improve client/server communication