Expanding partner mapping function
Implementing partner mapping functions