Link Manager Refactoring