Updated Scaffold templates