Expanded class hierarchy of Client