Added configuration loader