FIX: Move ES instance to WatcherTread attribute