New version of the db structure