Added binary-raw-data and text-raw-data