Updated for node interface