Removed thrift dependency