Update for base64 encoding and nodeid changes