Add fields to iter_servers