We move everything to the models. We feature-flag it, because we probably want to change the names etc, and we aren't going to be able to offer smooth upgrades until that is done.
Justin Santa Barbara