Added automatic node-linking