Added more template data