Added Keith's Avro stuff from main branch.