Added configuration implementation