Adding more classes!