Updated shard watcher