Add TemplateBuilder and specs