Updated some templates