Updated BASIC and CommandCollection