Code generation updated