Added more classes
D: