[TASK] Continue work on node listing