Changes to tuple class