Refine the models (again)