Changes for Kafka AAF integration