Added assessment type field and removed package type