Added factories for ComboBox and Table