Improve parsing to accept parameterized types