Some relevamce changes for Thrift definition