Updated Token and NonTerminal Definitions