Feature/templatizer