Expanded setup code to work with module8 Avro processing