Comment bugfix
Add QoS and flags management