Raw use of parameterized class (18/19)

Raw use of parameterized class