Added node checks