Update template system + checklist