Config consolidation