Rework Client class on the server