A method for maintaining mapping within a media-independent handover, MIH, network having at least two MIH functions, the method comprising: generating a mapping table at a first MIH function, wherein the mapping table includes a mapping of MIH function identifiers to a list of transport addresses; receiving a message at the first MIH function from a peer MIH function, the message including an MIH function identifier for the peer MIH function and a transport address for the peer MIH function; invoking an update address operation to create, update or delete a mapping for the peer MIH function in response to the message; determining whether there is an existing mapping for the peer MIH function to be updated; when there is not an existing mapping for the peer MIH function to be updated, invoking a create mapping operation to map an MIH function identifier for the peer MIH function to a transport address for the peer MIH function; when there is an existing mapping for the peer MIH function to be updated, invoking a modify address operation, wherein the modify address operation includes: determining whether to invoke a replace address operation or to invoke an append address operation, wherein: when the peer MIH function is configured to simultaneously use multiple interfaces having different transport addresses, the append address operation is invoked to append the transport address received in the message to the existing mapping for the peer MIH function; and when the peer MIH function is not configured to simultaneously use multiple interfaces having different transport addresses, the replace address operation is invoked to replace the transport address for the peer MIH function in the existing mapping with the transport address received in the message. generating a mapping table at a first MIH function, wherein the mapping table includes a mapping of MIH function identifiers to a list of transport addresses; receiving a message at the first MIH function from a peer MIH function, the message including an MIH function identifier for the peer MIH function and a transport address for the peer MIH function; invoking an update address operation to create, update or delete a mapping for the peer MIH function in response to the message; determining whether there is an existing mapping for the peer MIH function to be updated; when there is not an existing mapping for the peer MIH function to be updated, invoking a create mapping operation to map an MIH function identifier for the peer MIH function to a transport address for the peer MIH function; when there is an existing mapping for the peer MIH function to be updated, invoking a modify address operation, wherein the modify address operation includes: determining whether to invoke a replace address operation or to invoke an append address operation, wherein: when the peer MIH function is configured to simultaneously use multiple interfaces having different transport addresses, the append address operation is invoked to append the transport address received in the message to the existing mapping for the peer MIH function; and when the peer MIH function is not configured to simultaneously use multiple interfaces having different transport addresses, the replace address operation is invoked to replace the transport address for the peer MIH function in the existing mapping with the transport address received in the message. determining whether to invoke a replace address operation or to invoke an append address operation, wherein: when the peer MIH function is configured to simultaneously use multiple interfaces having different transport addresses, the append address operation is invoked to append the transport address received in the message to the existing mapping for the peer MIH function; and when the peer MIH function is not configured to simultaneously use multiple interfaces having different transport addresses, the replace address operation is invoked to replace the transport address for the peer MIH function in the existing mapping with the transport address received in the message. when the peer MIH function is configured to simultaneously use multiple interfaces having different transport addresses, the append address operation is invoked to append the transport address received in the message to the existing mapping for the peer MIH function; and when the peer MIH function is not configured to simultaneously use multiple interfaces having different transport addresses, the replace address operation is invoked to replace the transport address for the peer MIH function in the existing mapping with the transport address received in the message.