Links refactor