Few modification in Thrift