Add date fields to template. PD-361