Update for manifest 2.0 compatibility