Add register and deregister check