structual updates for templates parsing