Various improvements in manifest groupings