Refactored CMD and DRE objects.