Added templates to output