Added more classes and expanded on class