Added configuration handling