Changed Tokenizer format and output
Added new tokenizers