Merged the db handler into the master branch