Add unregister and some conditions