added some stuff for CodeGen