Links refactoring