Rewrite a bit the config :-)