Scaffolding updates