Models: Update to match SQL

refs #7303

WIP