Added configuration option support