Added next-gen template