Converted to parameterized class