Better handling of configuration files