Changed config file handling