Added support for shards