DRY up consolidated models.

Fixes [#78695166].
Merge pull request #56 from GovWizely/calum/dry-up-consolidated-models

DRY up consolidated models.