Changes to grammar builder to work with Keyword instead of int[]