Changes related to scaffolding