Updated for manifest v2