Updated madness header tree structure