Initial support for multiple-shards