Re-imported the RawDataFormatReader classes