Added the newer templates