Added generic scaffolding