Adding some more classes