Almost complete the thrift service