Massive improvement for the class structure of the client