Updated to new manifest format