Added parameterized type support to the parser