Added better shader and node support