LinkStore: REeplacing manual binding -> GenericEntity