Add safe delete support