adding better additional_data mapping