Upgrade changes in code generator