Replace `onConnection` with `watchConnection`