Improve Db backend