Migrate v1 scenarios to v2

Last updated