Added some new classes.