Added code generation