Move functions from Drop to DropController