fixup! Add Shard Spaces and Retention Policies