Added scaffolds for assessments