Rework around store/HSP and format/manifest