Use primary_address field