added better node support