Updated ASON grammar