Update template, example, and tests