Merge "Refactor ConsumerBase and it's derived classes."