LinkService improved