Added configuration support