Update to Manifest 2