Actually use new DB class
Fix issues in DB class