Updated client to handle nested parameterized types