Add handing and new config property for scenario timeout