Use new structured address where possible