Node improvements