ConsumerWrapper refactoring