Updated token fetching to allow for the use of an arbitrary constraint.