Added nested generics support on the client side