db structure improved