updated to support manifest v2