Added ability to watch for changes.