Required changes for new models