better node support