Adding generic scaffolds