Added support for raw data