Changes to templates, before removing iterator