added comboType enum and new variable in EDLocation object