Integrate with Kodo 18.0.0