Replaced use of table string with template