Added initial DataConsumer and DataProvider injection