Revise token structs