Reorganized LinkService