Added ability to unregister