Updated node client