Added changes to support new db.