Updated to manifest v2