Added option for space tokenizer