Added support for tokenizing files