Added support for tombstones.