Redid Thrift option class (earlier version was for Classic Prepare)