Added functionality to store token type for KeywordToken and id for IdentifierToken.