Added shards management