Updated template references