Replace wait_status with queue_com in user