Expanded class hierarchy of Schema