redesigned with a better manifest schema