Modified grammar.xml