added support for server_address