Completed QoS 1 refactoring.