addes full support for watch events (target added)