move address handling to common code