Move user tracking into the queue