Add unregister functionality