Adjustments to the template system