Compatibility with paho-matt>=2 & added features