Added configuration logic