Updated some classes and added some