Adding support for skipping deleted records