Added configuration file support