Added handling for address2 and address3.