Modified code generation