Added support for manifest_version 2.