Finishing up the changes with HashTree thrift server and client