Feature/templates