added full support for watch events (added target)