Changes to support delete.