Update to use scaffold from 1.2.6