Add soft delete functionality part 1
Add soft delete functionality part 2