[DF-1785] Dropper refactoring