Updated with missing templates