Separated more client classes.