Added private address support