added Thrift support