Modified db structure