Add template hierarchy to the rest of templates