Added configuration file handling