Replaced call to AddressResolver with member variable access.
TODO split