Update to 'DataConsumer' and 'DataProvider' injection