Swapped to DST templating