Lots of update to DB class