Support for parsing of generics

Support for parsing of generics