Add rest of templates