Add fields to get_server