Export and add token_type for to_json return #1431

Closed vihu closed 2 years ago