Replaced remote_addr usage