Adding support for soft deletes