Move consolidation code into base class