Add linking support to the navigator