Adjust for model changes