Droplist refactoring