Add db to setup
Merge branch 'hotfix/db-setup-fix'