Improve client server functionality