Improving templates, so that no router is used anywhere