adding support for delete mapping and unit tests