Updated class ClassCreator