Adding support for deleted records