changed db structure