[OE-2716] updated to support new address method