Major changes to quality model