Updated class files