Added begin- and end_scenario callbacks