Changed parsing of config file