Replaced Thrift with Avro