Completed support to logical delete