Scaffold templates updated