Rework the configuration