Adding CFX and QCOM Optimiation