added avro!!!!!
clean code