Updated template for types