Consolidate configuration