Added configuration handling.