Upgrade to v2 manifest