Expanded class hierarchy of completeCase