Links support (base and item), refactoring