Registration watchers

Fix for #117