I would put this in AvroSchemaConverter, that way we can look into factoring the schema logic.