Allow to have a different internal address and public address

Hi, 

This commit allow to have a different internal address and public address

Cheers,