Added support for shards and scan time