Added sharding support