Grammar API stuff is extended