I vote for moving to each model which requires it.