Refactored link paths