Added tokenizing