Statement tmpl refactoring