Feature/template change