Upgraded to manifest v2 and made perf improvements