Thrift Integration WIP