Added configuration capability