Add in goals around db structure