Updated scenario steps definitions