Adding in new composite classes.