Updated setup to not create additional databases
Merge branch 'inventory'