Updated for manifest version 2