Added configuration option