Config file handling changes