Adds data_headers for clarity