Refactoring to reuse some code, and rely on link generator.
Single place for adding values to link map.