Using Token instead of NamedEntity