Database model initial commit
Merge branch 'features/database_model'