Added logic to combobox