Updated tokenTypes to incorporate new fields.