Added comments into the template