Added configuration setup