Updated some classes with new methods