Update data bag usage to allow easy integration with existing setups