Refactored data classes