Update mapping for generics