Added: Parameterized Class Support