Migrate scaffolding from previous commit