Updating for manifest_version: 2