Add support for dropping