Optimized templating hierarchy
Changed templating hierarchy