Added TemplateLibrary where appropriate