Updated Scaffold Templates