UP: Added tokenizer_func kwarg