Add Node ID and fix serial_addr to source_addr