Added comments to template system