Added some stuff for codegen, also for more stored info