LPS-45930 Let's keep (for now) all the logic within the templates)