Change way of working for listing nodes