Sync to new db structure