Added more classes