Added header and flags subtrees