Generics added to DataMap