Added a few new classes.