Use ip_address consistently