CC-4961: Show linking

Refactoring