Changed tokenization methodology