Improve template authoring, support multiple and optional fields
Improve template authoring