Added previous CodeGenerator as CodeGenerator1