Added support for tuples of types