Added TupleDesc and Type
Merge branch 'glen'