added support for assessments and other features