Modify for changed configuration