Continuing work on template support