[mr3244] More work to fit base and latest changes in db structure