Removed TupleType for 10 and 11; made tuple of tuple on the 11