Added support for QoS