Switch to registry that actually informs of changes