Updated template calls