Simplification of parser, correction of generics