Feature/node validator