Added the token values to the spans