Updated all the extra writers to also include an optional template-origin field.