DB setup

Database class changes