Node detection added