Update data template to explicitly specify return type as warned by compiler