Updated setup for current thrift