Support for --raw-data [2]