Smarter node identification