Implemented proper tombstone handling