Removed dependance on server_address