Add expunge support