#81 match types, support FieldInfos, added scenarios