#150: Ease v1 -> v2 migration.