Updated the units definition file and added utility methods to the tokenizer