Fixed implementation issues related to class De