Feature/template helpers