Added more scaffolding