Added fields, functions and changed some functions in Token.