added scaffolds and models