Added node properties checks