Improve token definition.