Last few changes needed to make both attributes and a data bag work