Added TupleDesc and Type