Updated less-node handling