Added unregister method