Update to manifest version 2