Better support for deleting items