Grammar and Visitor Updates