Added Thrift-Support