Better handling of all config file format