Added a few more classes.