Updated to manifestVersion 2