Added configuration handler