Added scaffolding