Update on db structure