Added thrift mode