Added some extra classes.