Tuple Handling reworked