GH120 - Use link handlers mechanism

Issue #120