Modifying client and server classes.