Upgrading to v2 from previous versions