changed data_parser to marshaller