Move to thrift