Changed the way hierarchical headers are dealt with