Updated to implement combobox