Add additional scaffoloding