Refactored scaffolding