Added (partially) a TuplePicker.