Added comments to templates