Add NodeAddr to Node definitions