New version of the Grammar data-structure