More major changes to conform to dictionary-rating-model.