Updated the class files