Added more classes and modified some existing classes.