Expanded class hierarchy of Markup