Upgrade to work with Manifest version 2.