Updated scaffold templates