Tuple handling review