Added client and channel classes.