Sharding support implemented