Fixed new class creation