Adding missing templates