Updated grammar and data structure.