Updating models with new override structure