More refactoring of link interpreter