Tokenizer now uses KeyValueResultData