Replaced token definition subclasses with a single token definition class