added some more classes