Make changes to Kafka Service and runnable