add support for raw data