Database model factory in progress...
Merge remote-tracking branch 'origin/master'