Added kafka type and default_queries