Revamp the configuration