Updated template scripts