Switch to dataclass-based data reader