Upgrade to manifest v2