Added connection address handling.