Added multi-home support