acu102411: Renamed EndPoint to AddressList, and removed monkey patch.