Updated data classes