Added support for parameterized types