Simplify some of the template composition