Added some more classes