New templates due to schema changes