Added ability to drop a device