Refactor Feature into subscenario's