Dropdown refactoring started.