Add optional soft deleting