Added database class -WB