Add templates, and static