Added Paho client changes