Added 'DataConsumerFactory' and 'DataProviderFactory' support