Add fields to get_host