Completed changes to Assessment and its child classes