Improve node plugin