Added new models and scaffolds