Update to include QoS1 support