some changes in db structure