Added missing templates