Update DB settings and add some more handlers
Update DB classes and add some more handlers