Adding tuple generator classes