Added the changes to DBM class as well.