added generics to one mapBy