Better handling of config file