Add model factories
Merge branch 'add-model-factories'