Added raw node count feature