Changes in code generation module