Add more scaffolding