Add support for watchers. Sometimes things work.