Raw-data improvements