Added configuration ability