Added tomstone support