fixed missing typename
adapt to missed cases on new Mapping inherit /use KeyValuePair