More modifications on the config handling