Add thrift mode