Adding support for simple scaffolding