Upgraded to manifest v2