Added generic type node, and more to parser (string, parenthesis)