Added raw scaffolds