Added QAM Mapping handling