Simplified the scenario specific code