Added unregister_all