Added avro (improvment)