Better handling of configuration file