Updated template for my classes