adapted to new db module layout