Updated LinkEntities model