Adding international address functionality