Added better suppport for parameterized types