Added configuration generation