Expanded class hierarchy of ConditionFundamentals