Shard improvements