Take Kafka out of model API