Renamed class data class per feedback.