An access point may perform a method for X2 communication set up in a wireless communication network. The method may include discovering a neighbor node at an access point, optionally in response to detecting a new neighbor node, or an address parameter change at a neighbor node. The method may further include transmitting to an X2 gateway (X2-GW), a registration message comprising an address of the neighbor node for X2 communication. The registration message may include at least two addresses of the at least one neighbor node, the two addresses corresponding to addresses at a higher protocol layer and a lower protocol layer, for example a transport network layer (TNL) address and radio network layer (RNL) address of the at least one neighbor node. The access point may further receive an acknowledgement message from the X2-GW for the registration message.