Updated HashMap with type arguments