Link/node events refactorings