Changes for issue #347

Proper pull request for issue #347. Updates the watch logic to create a one to many mapping for updates.