structure of dtb mapping/dao/entities/managers changed