Updates to templates to handle boolean and Date types.