Added support for Tuple5 and Tuple6