Updated to manifest version 2