Prepare for new models