Rework RatingData class