More cqi indicators added and equivalent mapping