Added changes to generated code