Add QoS 1 and QoS 2 support