Use new db structure