Added some more classes.