Added user scaffolding