Added configuration loading