Added tokenizer first steps