Updates to scaffolding