Make RawDataPackage multi-timestamp aware