Added Paho changes