Manage parameterized classes properly