Add more ways of returning node names