Rewrote parser to account for changes to tree builder -i.e. hierarchical
keys