Changes for queue picker server