Added additional configuration parameters