Identify the ADDH, ADDL, CHAN of the Message Sender

Hi Renzo If several endpoints (with specific and individual ADDH, ADDL, CHAN) send messages to the same Gateway (with ADDH, ADDL and CHAN fixed and known by all endpoints). For the Gateway to identify the ADDH, ADDL, CHAN of the endpoint, I would have to inform them in the message, correct? (NOTE_01: I am considering that the Gateway does not internally store the ADDH, ADDL, CHAN of the endpoints) (NOTE_02: The identification of ADDH, ADDL, CHAN by the Gateway would be useful for situations in which a confirmation response [ACK] is required) Example:

struct MessageHumidity {
char id_endpoint[2];
uint8_t addh_remitter;
uint8_t addl_remitter;
uint8_t chan_remitter;
uint8_t humidity;
};

Ex: Endpoint_1
ADDH = 1
ADDL = 1
CHAN = 1

Eg: Endpoint_2
ADDH = 2
ADDL = 2
CHAN = 2

Ex: Gateway
ADDH = 3
ADDL = 3
CHAN = 3