added ExternalAddress and changed Address to UserAddress