Added change to data bag structure