Added some classes and modified some others