Add template improvements