Changes to consolidate configuration