Refactoring model and dbtable flow
Merge branch 'hotfix/1.0.0' into develop