Added support for primitive tuples