Updated some classes with new properties