Updated to include tokenize.*