Moved token store to abstract superclasses