Adding support for deferred deletions