Implemented tombstone handling