Add new methods and improved tokenize()