Added ability to drop devices and vouchers