updated StreamWatcher timeout and added a getContext() method