Extended with raw_data input