Added flags to templates