Updated client and broker to send UID across