Included type inference in the parser file
Merge