Updated client's hierarchy for HTML