Changed unregister structure