Updated config file parser