Initial changes to watchers to allow session copying