Updated templates for CMM 3 and CSL 3 compatibility.