Add states missing template.
Add back other missing templates.