Added code generator